Removed fixed size of environment vars.

[reactos.git] / reactos / lib / msvcrt / stdlib / getenv.c

diff --git a/reactos/lib/msvcrt/stdlib/getenv.c b/reactos/lib/msvcrt/stdlib/getenv.c
index 3fd11b4..359ac0d 100644 (file)
--- a/reactos/lib/msvcrt/stdlib/getenv.c
+++ b/reactos/lib/msvcrt/stdlib/getenv.c
@@ -1,23 +1,35 @@
 #include <windows.h>
 #include <msvcrt/stdlib.h>
 
+#define NDEBUG
+#include <msvcrt/msvcrtdbg.h>
+
 
 char *getenv(const char *name)
 {
-       char *buffer;
-       buffer = (char *)malloc(MAX_PATH);
-       buffer[0] = 0;
-       if ( GetEnvironmentVariableA(name,buffer,MAX_PATH) == 0 )
+       char *buffer = (char*)0xffffffff;
+       int len = GetEnvironmentVariableA(name,buffer,0) + 1;
+       DPRINT("getenv(%s)\n", name);
+       buffer = (char *)malloc(len);
+       DPRINT("getenv('%s') %d %x\n", name, len, buffer);
+       if (buffer == NULL || GetEnvironmentVariableA(name,buffer,len) == 0 )
+       {
+               free(buffer);
                return NULL;
+       }
        return buffer;
 }
 
 wchar_t *_wgetenv(const wchar_t *name)
 {
-       wchar_t *buffer;
-       buffer = (wchar_t *)malloc(MAX_PATH * sizeof(wchar_t));
-       buffer[0] = 0;
-       if ( GetEnvironmentVariableW(name,buffer,MAX_PATH) == 0 )
+       wchar_t *buffer = (wchar_t*)0xffffffff;
+       int len = GetEnvironmentVariableW(name, buffer,0) + 1;
+       DPRINT("_wgetenv(%S)\n", name);
+       buffer = (wchar_t *)malloc(len * sizeof(wchar_t));
+       if (buffer == NULL || GetEnvironmentVariableW(name,buffer,len) == 0)
+       {
+               free(buffer);
                return NULL;
+       }
        return buffer;
 }