Changeset 8675 for trunk/src/kernel32/Fileio.cpp

Timestamp:

Jun 15, 2002, 1:27:03 PM (23 years ago)

Author:

sandervl

Message:

Check for NULL parameters in GetFullPathNameW

File:

• trunk/src/kernel32/Fileio.cpp (modified) (4 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.65 2002-02-09 12:45:11 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.66 2002-06-15 11:27:03 sandervl Exp $ */
 
 /*
@@ -893 +893 @@
                                 LPWSTR lpBuffer, LPWSTR *lpFilePart)
 {
- char *astring, *asciibuffer, *asciipart;
+ char *astring = NULL, *asciibuffer = NULL, *asciipart = NULL;
  DWORD rc;
 
-  asciibuffer = (char *)malloc(nBufferLength+1);
+  if(nBufferLength) {
+      asciibuffer = (char *)malloc(nBufferLength+1);
+  }
   astring     = UnicodeToAsciiString((LPWSTR)lpFileName);
 
@@ -906 +908 @@
            asciibuffer));
 
-  if(rc)
+  if(rc && asciibuffer)
     AsciiToUnicode(asciibuffer,
                    lpBuffer);
@@ -918 +920 @@
 
   FreeAsciiString(astring);
-  free(asciibuffer);
+  if(asciibuffer) free(asciibuffer);
   return(rc);
 }