Changeset 5596 for trunk/src/kernel32/environ.cpp

Timestamp:

Apr 26, 2001, 7:01:58 PM (24 years ago)

Author:

sandervl

Message:

GetEnvironmentVariableW fix (breakpoint hit in debug build)

File:

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

trunk/src/kernel32/environ.cpp

@@ -1 @@
-/* $Id: environ.cpp,v 1.10 2001-04-05 05:54:51 sandervl Exp $ */
+/* $Id: environ.cpp,v 1.11 2001-04-26 17:01:58 sandervl Exp $ */
 
 /*
@@ -134 +134 @@
   DWORD rc;
 
+  if (!lpName || !*lpName)
+  {
+      dprintf(("GetEnvironmentVariableW: invalid name!"));
+      SetLastError(ERROR_INVALID_PARAMETER);
+      return 0;
+  }
+
   if(nSize) {
        asciibuffer = (char *)malloc(nSize+1);
@@ -143 +150 @@
 
   rc = CALL_ODINFUNC(GetEnvironmentVariableA)(astring, asciibuffer, nSize);
-  AsciiToUnicode(asciibuffer, lpBuffer);
+  if(asciibuffer)
+      AsciiToUnicode(asciibuffer, lpBuffer);
   FreeAsciiString(astring);
   if(asciibuffer)