Changeset 21542 for trunk/src

Timestamp:

Jan 6, 2011, 12:34:08 PM (15 years ago)

Author:

dmik

Message:

minivcrt: Fixed _fullpath() which could implicitly change the current drive (LIBC bug).

File:

• trunk/src/msvcrt/dir.c (modified) (2 diffs)

trunk/src/msvcrt/dir.c

@@ -62 +62 @@
 #include <errno.h>
 #include <stdlib.h>
+#include <limits.h>
 
 #ifdef __EMX__
@@ -778 +779 @@
 #ifdef __EMX__
 
-// The EMX version of _fullpath() returns int instead of char*,
-// provide a wrapper
+// The EMX version of _fullpath() returns int instead of char* and implicitly
+// changes the current drive. It also doesn't expect absPath to be NULL and
+// allocate a buffer in this case. Provide a wrapper to fix these issues.
 char *MSVCRT__fullpath(char * absPath, const char* relPath, unsigned int size)
 {
-    return _fullpath(absPath, relPath, size) == 0 ? absPath : NULL;
+    char *buf = NULL;
+    if (absPath == NULL)
+    {
+        size = PATH_MAX;
+        absPath = buf = (char *)MSVCRT_malloc(size);
+        if (buf == NULL)
+        {
+            *MSVCRT__errno() = ENOMEM;
+            return NULL;
+        }
+    }
+
+    int d = _getdrive();
+    char *result = _fullpath(absPath, relPath, size) == 0 ? absPath : NULL;
+    _chdrive(d);
+
+    if (result == NULL && buf != NULL)
+      MSVCRT_free(buf);
+
+    return result;
 }