In AtlModuleInit do not call initialization procedures that are NULL.

62e1a0f2 · Aric Stewart · Alexandre Julliard · 84ae4d8b · 62e1a0f2
Commit 62e1a0f2 authored Aug 19, 2005 by Aric Stewart Committed by Alexandre Julliard Aug 19, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

atl_main.c dlls/atl/atl_main.c +8 -4

No files found.
--- 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);
+        while (pM->m_pObjMap[i].pclsid != NULL)
-        p[i].pfnObjectMain(TRUE);
+        {
-        i++;
+            TRACE("Initializing object %i %p\n",i,p[i].pfnObjectMain);
+            if (p[i].pfnObjectMain)
+                p[i].pfnObjectMain(TRUE);
+            i++;
+        }
    }
    return S_OK;