X-Git-Url: http://git.jankratochvil.net/?p=reactos.git;a=blobdiff_plain;f=lib%2Fmsvcrt%2Fmisc%2Fdllmain.c;fp=lib%2Fmsvcrt%2Fmisc%2Fdllmain.c;h=c23e4e0539c609a9ee2da59c02933ff055eac64e;hp=65f908ef9111e3181bc8defd35a320f8f0801e52;hb=7c0db166f81fbe8c8b913d7f26048e337d383605;hpb=e3ed2d773259cc445c7ff8181ebd934931365328 diff --git a/lib/msvcrt/misc/dllmain.c b/lib/msvcrt/misc/dllmain.c index 65f908e..c23e4e0 100644 --- a/lib/msvcrt/misc/dllmain.c +++ b/lib/msvcrt/misc/dllmain.c @@ -42,6 +42,7 @@ extern unsigned int _winver; extern char* _acmdln; /* pointer to ascii command line */ #undef _environ extern char** _environ; /* pointer to environment block */ +extern char** __initenv; /* pointer to initial environment block */ /* LIBRARY GLOBAL VARIABLES ***************************************************/ @@ -125,7 +126,11 @@ DllMain(PVOID hinstDll, ULONG dwReason, PVOID reserved) /* destroy heap */ if (nAttachCount == 0) { - + if (__initenv && __initenv != _environ) + { + free(__initenv); + __initenv = NULL; + } if (_environ) { FreeEnvironmentStringsA(_environ[0]);