Changeset 7947 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Feb 18, 2002, 10:33:29 PM (24 years ago)

Author:

phaller

Message:

Fix: GetModuleHandleW(lpwszModuleName == NULL) fixed free(NULL)

File:

• trunk/src/kernel32/wprocess.cpp (modified) (3 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.144 2002-02-09 12:45:14 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.145 2002-02-18 21:33:29 phaller Exp $ */
 
 /*
@@ -240 +240 @@
     SID_IDENTIFIER_AUTHORITY sidIdAuth = {0};
     winteb->o.odin.threadinfo.dwType = SECTYPE_PROCESS | SECTYPE_INITIALIZED;
-    RtlAllocateAndInitializeSid(&sidIdAuth, 1, 0, 0, 0, 0, 0, 0, 0, 0, &winteb->o.odin.threadinfo.SidUser.User.Sid);
+  
+    if (NULL != RtlAllocateAndInitializeSid)
+      RtlAllocateAndInitializeSid(&sidIdAuth, 1, 0, 0, 0, 0, 0, 0, 0, 0, &winteb->o.odin.threadinfo.SidUser.User.Sid);
+  
     winteb->o.odin.threadinfo.SidUser.User.Attributes = 0; //?????????
 
     winteb->o.odin.threadinfo.pTokenGroups = (TOKEN_GROUPS*)malloc(sizeof(TOKEN_GROUPS));
     winteb->o.odin.threadinfo.pTokenGroups->GroupCount = 1;
-    RtlAllocateAndInitializeSid(&sidIdAuth, 1, 0, 0, 0, 0, 0, 0, 0, 0, &winteb->o.odin.threadinfo.PrimaryGroup.PrimaryGroup);
+  
+    if (NULL != RtlAllocateAndInitializeSid)
+      RtlAllocateAndInitializeSid(&sidIdAuth, 1, 0, 0, 0, 0, 0, 0, 0, 0, &winteb->o.odin.threadinfo.PrimaryGroup.PrimaryGroup);
+  
     winteb->o.odin.threadinfo.pTokenGroups->Groups[0].Sid = winteb->o.odin.threadinfo.PrimaryGroup.PrimaryGroup;
     winteb->o.odin.threadinfo.pTokenGroups->Groups[0].Attributes = 0; //????
@@ -1592 +1598 @@
 //******************************************************************************
 //******************************************************************************
-HMODULE WIN32API GetModuleHandleW(LPCWSTR arg1)
-{
- HMODULE rc;
- char   *astring;
-
-    astring = UnicodeToAsciiString((LPWSTR)arg1);
-    rc = GetModuleHandleA(astring);
-    dprintf(("KERNEL32:  OS2GetModuleHandleW %s returned %X\n", astring, rc));
+HMODULE WIN32API GetModuleHandleW(LPCWSTR lpwszModuleName)
+{
+  HMODULE rc;
+  char   *astring = NULL;
+
+  if (NULL != lpwszModuleName)
+    astring = UnicodeToAsciiString((LPWSTR)lpwszModuleName);
+  
+  rc = GetModuleHandleA(astring);
+  dprintf(("KERNEL32:  OS2GetModuleHandleW %s returned %X\n", astring, rc));
+  
+  if (NULL != astring)
     FreeAsciiString(astring);
-    return(rc);
+  
+  return(rc);
 }
 //******************************************************************************