Commit 93f99fba authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard

msvcrt: Don't crash on NULL argument in _wgetenv.

(cherry picked from commit d812af3f)
parent 8d2a7f6b
...@@ -50,12 +50,15 @@ char * CDECL getenv(const char *name) ...@@ -50,12 +50,15 @@ char * CDECL getenv(const char *name)
} }
/********************************************************************* /*********************************************************************
* _wgetenv (MSVCRT.@) * _wgetenv (MSVCRT.@)
*/ */
wchar_t * CDECL _wgetenv(const wchar_t *name) wchar_t * CDECL _wgetenv(const wchar_t *name)
{ {
wchar_t **env; wchar_t **env;
unsigned int length=wcslen(name); size_t len;
if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL;
len = wcslen(name);
/* Initialize the _wenviron array if it's not already created. */ /* Initialize the _wenviron array if it's not already created. */
if (!MSVCRT__wenviron) if (!MSVCRT__wenviron)
...@@ -65,7 +68,7 @@ wchar_t * CDECL _wgetenv(const wchar_t *name) ...@@ -65,7 +68,7 @@ wchar_t * CDECL _wgetenv(const wchar_t *name)
{ {
wchar_t *str = *env; wchar_t *str = *env;
wchar_t *pos = wcschr(str,'='); wchar_t *pos = wcschr(str,'=');
if (pos && ((pos - str) == length) && !_wcsnicmp(str,name,length)) if (pos && ((pos - str) == len) && !_wcsnicmp(str, name, len))
{ {
TRACE("(%s): got %s\n", debugstr_w(name), debugstr_w(pos + 1)); TRACE("(%s): got %s\n", debugstr_w(name), debugstr_w(pos + 1));
return pos + 1; return pos + 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment