Changeset 3699

Timestamp:

Jun 13, 2000, 8:00:22 PM (25 years ago)

Author:

phaller

Message:

Fix reverted: alloca back in

Location:

trunk

Files:

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

trunk/changelog

@@ -1 @@
- /* $Id: changelog,v 1.985 2000-06-13 06:42:56 phaller Exp $ */
+ /* $Id: changelog,v 1.986 2000-06-13 18:00:22 phaller Exp $ */
 
  2000-06-12: Patrick Haller <phaller@gmx.net>
@@ -7 +7 @@
     - KERNEL32:     - moved GetNumberFormat to different source file and enhanced
                       it a little (WinRAR shows file sizes)
-                    - fixed (just too stupid) memory leaks in directory functions
                     - creating an existing directory does not return an error ?!
                     - updated GetStringTypeA/W and GetStringTypeExA/W

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.25 2000-06-12 14:59:37 phaller Exp $ */
+/* $Id: directory.cpp,v 1.26 2000-06-13 17:56:45 phaller Exp $ */
 
 /*
@@ -158 +158 @@
               LPCSTR, lpstrDirectory)
 {
-  char szBuffer[260]; // MAXPATHLEN
-  
   if(HIWORD(lpstrDirectory) == 0)
   {
@@ -173 +171 @@
        (len != 1) )
   {
-    lstrcpynA(szBuffer,
+    LPSTR lpTemp = (LPSTR)_alloca(len);
+    lstrcpynA(lpTemp,
               lpstrDirectory,
               len - 1);
-    szBuffer[len - 1] = 0;
-    lpstrDirectory = szBuffer;
+    lpTemp[len - 1] = 0;
+    lpstrDirectory = lpTemp;
   }
 
@@ -225 +224 @@
               PSECURITY_ATTRIBUTES,arg2)
 {
-  char szBuffer[260]; // MAXPATHLEN
   int len = strlen(lpstrDirectory);
   
@@ -232 +230 @@
        (lpstrDirectory[len - 1] == '/') )
   {
-    lstrcpynA(szBuffer,
+    LPSTR lpTemp = (LPSTR)_alloca(len);
+    lstrcpynA(lpTemp,
               lpstrDirectory,
               len - 1);
-    szBuffer[len - 1] = 0;
-    lpstrDirectory = szBuffer;
+    lpTemp[len - 1] = 0;
+    lpstrDirectory = lpTemp;
   }
   
@@ -419 +418 @@
               LPCSTR, lpstrDirectory)
 {
-  char szBuffer[260]; // MAXPATHLEN
   int len = strlen(lpstrDirectory);
   
@@ -426 +424 @@
        (lpstrDirectory[len - 1] == '/') )
   {
-    lstrcpynA(szBuffer,
+    LPSTR lpTemp = (LPSTR)_alloca(len);
+    lstrcpynA(lpTemp,
               lpstrDirectory,
               len - 1);
-    szBuffer[len - 1] = 0;
-    lpstrDirectory = szBuffer;
+    lpTemp[len - 1] = 0;
+    lpstrDirectory = lpTemp;
   }