archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- be sure to check if the var ha not been removed between the two calls

Browse source
This commit is contained in:
Pierre Joye 2011-09-26 08:49:28 +00:00
parent 3e0e2820b8
commit aeee365d72
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/standard/basic_functions.c
View file

@ -4022,8 +4022,14 @@ PHP_FUNCTION(getenv)
ptr = emalloc(size); ptr = emalloc(size);
size = GetEnvironmentVariableA(str, ptr, size); size = GetEnvironmentVariableA(str, ptr, size);
if (size == 0) {
/* has been removed between the two calls */
efree(ptr);
RETURN_EMPTY_STRING();
} else {
RETURN_STRING(ptr, 0); RETURN_STRING(ptr, 0);
} }
}
#else #else
/* system method returns a const */ /* system method returns a const */
ptr = getenv(str); ptr = getenv(str);