From 62e1a0f201cfb38acb0110aa155197817c50ced7 Mon Sep 17 00:00:00 2001
From: Aric Stewart <aric@codeweavers.com>
Date: Fri, 19 Aug 2005 09:58:02 +0000
Subject: [PATCH] In AtlModuleInit do not call initialization procedures that
 are NULL.

---
 dlls/atl/atl_main.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c
index e4d5d271f0f..2e345590b51 100644
--- a/dlls/atl/atl_main.c
+++ b/dlls/atl/atl_main.c
@@ -65,11 +65,15 @@ HRESULT WINAPI AtlModuleInit(_ATL_MODULEA* pM, _ATL_OBJMAP_ENTRYA* p, HINSTANCE
 
     /* call mains */
     i = 0;
-    while (pM->m_pObjMap[i].pclsid != NULL)
+    if (pM->m_pObjMap != NULL)
     {
-        TRACE("Initializing object %i\n",i);
-        p[i].pfnObjectMain(TRUE);
-        i++;
+        while (pM->m_pObjMap[i].pclsid != NULL)
+        {
+            TRACE("Initializing object %i %p\n",i,p[i].pfnObjectMain);
+            if (p[i].pfnObjectMain)
+                p[i].pfnObjectMain(TRUE);
+            i++;
+        }
     }
 
     return S_OK;
-- 
2.11.4.GIT