Changeset 8327 for trunk/src/kernel32/directory.cpp

Timestamp:

Apr 29, 2002, 7:05:30 PM (23 years ago)

Author:

sandervl

Message:

PH: memory leak fixes; extra checks for NULL pointers; CreateProcess changes for debug option; GetModuleFileName doesn't count 0 terminator

File:

• trunk/src/kernel32/directory.cpp (modified) (2 diffs)

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.45 2002-02-16 18:07:20 sandervl Exp $ */
+/* $Id: directory.cpp,v 1.46 2002-04-29 17:05:29 sandervl Exp $ */
 
 /*
@@ -733 +733 @@
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
     LPSTR extA  = HEAP_strdupWtoA( GetProcessHeap(), 0, ext );
+  
     dprintf(("SearchPathA %s %s %s", pathA, nameA, extA));
     DWORD ret = DIR_SearchPath( pathA, nameA, extA, (LPSTR)full_name );
-    HeapFree( GetProcessHeap(), 0, extA );
-    HeapFree( GetProcessHeap(), 0, nameA );
-    HeapFree( GetProcessHeap(), 0, pathA );
+  
+    if (NULL != extA)
+      HeapFree( GetProcessHeap(), 0, extA );
+  
+    if (NULL != nameA)
+      HeapFree( GetProcessHeap(), 0, nameA );
+  
+    if (NULL != pathA)
+      HeapFree( GetProcessHeap(), 0, pathA );
+  
     if (!ret) return 0;