msvcp: Return if module is not loaded (Coverity)

André Hentschel nerv at dawncrow.de
Sat Jan 4 12:24:55 CST 2014


1147949
---
 dlls/msvcp90/msvcp_main.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c
index 489aacb..d946f3b 100644
--- a/dlls/msvcp90/msvcp_main.c
+++ b/dlls/msvcp90/msvcp_main.c
@@ -67,7 +67,14 @@ static void init_cxx_funcs(void)
 {
     HMODULE hmod = GetModuleHandleA( MSVCRT_NAME(_MSVCP_VER) );
 
-    if (!hmod) FIXME( "%s not loaded\n", MSVCRT_NAME(_MSVCP_VER) );
+    if (!hmod)
+    {
+        FIXME( "%s not loaded\n", MSVCRT_NAME(_MSVCP_VER) );
+        MSVCRT_operator_new = NULL;
+        MSVCRT_operator_delete = NULL;
+        MSVCRT_set_new_handler = NULL;
+        return;
+    }
 
     if (sizeof(void *) > sizeof(int))  /* 64-bit has different names */
     {
-- 
1.8.1.2




More information about the wine-patches mailing list