Changeset 3347 for trunk/src

Timestamp:

Apr 7, 2000, 9:43:46 PM (25 years ago)

Author:

sandervl

Message:

fixed GetWindows/SystemDir (NULL pointer)

File:

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

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.17 2000-03-04 19:52:35 sandervl Exp $ */
+/* $Id: directory.cpp,v 1.18 2000-04-07 19:43:46 sandervl Exp $ */
 
 /*
@@ -220 +220 @@
  * Variables :
  * Result    :
- * Remark    :
+ * Remark    : Should return length of system dir even if lpBuffer == NULL
  * Status    :
  *
@@ -230 +230 @@
 {
   LPSTR lpstrEnv = getenv("WIN32.DIR.SYSTEM");          /* query environment */
+  CHAR  buf[255];
 
   if (lpstrEnv != NULL)
   {
-    lstrcpynA(lpBuffer,                   /* copy environment variable to buffer */
-              lpstrEnv,
-              uSize);
-    return (lstrlenA(lpBuffer));                /* return number of copies bytes */
+        if(lpBuffer)
+                lstrcpynA(lpBuffer, lpstrEnv, uSize);
+
+        return (lstrlenA(lpstrEnv));                /* return number of copies bytes */
   } 
   else
@@ -242 +243 @@
     int len;
 
-    len = ODIN_PROFILE_GetOdinIniString(ODINDIRECTORIES,"SYSTEM","",lpBuffer,uSize);
+    len = ODIN_PROFILE_GetOdinIniString(ODINDIRECTORIES,"SYSTEM","",buf,sizeof(buf));
     if (len > 2) {
-        if(lpBuffer[len-1] == '\\') {
-                lpBuffer[len-1] = 0; 
+        if(buf[len-1] == '\\') {
+                buf[len-1] = 0; 
                 len--;
         }
+        if(lpBuffer)
+                lstrcpynA(lpBuffer, buf, uSize);
+
         return len;
     }
     else {//SvL: Use path of kernel32.dll instead of calling Open32 api (which returns \OS2\SYSTEM)
-        lstrcpynA(lpBuffer, kernel32Path, uSize);
-        len = lstrlenA(lpBuffer);;
-        if(lpBuffer[len-1] == '\\') {
-                lpBuffer[len-1] = 0; 
+        lstrcpynA(buf, kernel32Path, sizeof(buf)-1);
+        len = lstrlenA(buf);;
+        if(buf[len-1] == '\\') {
+                buf[len-1] = 0; 
                 len--;
         }
+        if(lpBuffer)
+                lstrcpynA(lpBuffer, buf, uSize);
         return len;
     }
@@ -269 +275 @@
  * Variables :
  * Result    :
- * Remark    :
+ * Remark    : Should return length of system dir even if lpBuffer == NULL
  * Status    :
  *
@@ -278 +284 @@
                                        UINT,  uSize)
 {
-  char *asciibuffer = (char *)malloc(uSize+1);
+  char *asciibuffer = NULL;
   UINT  rc;
 
+  if(lpBuffer)
+        asciibuffer = (char *)malloc(uSize+1);
+
   rc = GetSystemDirectoryA(asciibuffer, uSize);
-  if(rc) AsciiToUnicode(asciibuffer, lpBuffer);
-  free(asciibuffer);
+  if(rc && asciibuffer)
+        AsciiToUnicode(asciibuffer, lpBuffer);
+
+  if(asciibuffer)
+        free(asciibuffer);
   return(rc);
 }
@@ -294 +306 @@
  * Variables :
  * Result    :
- * Remark    :
+ * Remark    : Should return length of system dir even if lpBuffer == NULL
  * Status    :
  *
@@ -304 +316 @@
 {
   LPSTR lpstrEnv = getenv("WIN32.DIR.WINDOWS");         /* query environment */
+  CHAR  buf[255];
 
   if (lpstrEnv != NULL)
   {
-    lstrcpynA(lpBuffer,                   /* copy environment variable to buffer */
-              lpstrEnv,
-              uSize);
-    return (lstrlenA(lpBuffer));                /* return number of copies bytes */
+        if(lpBuffer)
+                lstrcpynA(lpBuffer, lpstrEnv, uSize);
+
+        return (lstrlenA(lpstrEnv));                /* return number of copies bytes */
   } 
   else
@@ -316 +329 @@
     int len;
 
-    len = ODIN_PROFILE_GetOdinIniString(ODINDIRECTORIES,"WINDOWS","",lpBuffer,uSize);
+    len = ODIN_PROFILE_GetOdinIniString(ODINDIRECTORIES,"WINDOWS","",buf,sizeof(buf));
     if (len > 2) {
-        if(lpBuffer[len-1] == '\\') {
-                lpBuffer[len-1] = 0; 
+        if(buf[len-1] == '\\') {
+                buf[len-1] = 0; 
                 len--;
         }
+        if(lpBuffer)
+                lstrcpynA(lpBuffer, buf, uSize);
+
         return len;
     }
     else {//SvL: Use path of kernel32.dll instead of calling Open32 api (which returns \OS2\SYSTEM)
-     CHAR buf[255];
 
         lstrcpynA(buf, kernel32Path, sizeof(buf)-1);
@@ -331 +346 @@
         O32_CreateDirectory(buf, NULL);
 
-        lstrcpynA(lpBuffer, buf, uSize);
-        len = lstrlenA(lpBuffer);;
-        if(lpBuffer[len-1] == '\\') {
-                lpBuffer[len-1] = 0; 
+        len = lstrlenA(buf);;
+        if(buf[len-1] == '\\') {
+                buf[len-1] = 0; 
                 len--;
         }
+        if(lpBuffer)
+                lstrcpynA(lpBuffer, buf, uSize);
         return len;
     }
@@ -349 +365 @@
  * Variables :
  * Result    :
- * Remark    :
+ * Remark    : Should return length of system dir even if lpBuffer == NULL
  * Status    :
  *
@@ -358 +374 @@
                                         UINT,  uSize)
 {
-  char *asciibuffer = (char *)malloc(uSize+1);
+  char *asciibuffer = NULL;
   UINT  rc;
 
+  if(lpBuffer)
+        asciibuffer = (char *)malloc(uSize+1);
+
   rc = GetWindowsDirectoryA(asciibuffer, uSize);
-  if(rc)
-    AsciiToUnicode(asciibuffer, lpBuffer);
-  free(asciibuffer);
+  if(rc && asciibuffer)
+        AsciiToUnicode(asciibuffer, lpBuffer);
+
+  if(asciibuffer)
+        free(asciibuffer);
   return(rc);
 }
@@ -390 +411 @@
   if(tmp[len -1] == '\\')
     tmp[len -1] = 0;
+
+  dprintf(("RemoveDirectory %S", arg1));
+
   return O32_RemoveDirectory(tmp);
 }