mirror of
https://github.com/php/php-src.git
synced 2026-04-24 08:28:26 +02:00
Merge branch 'PHP-7.2'
* PHP-7.2: Fix invalid free
This commit is contained in:
+9
-1
@@ -586,12 +586,20 @@ static char *sapi_fcgi_getenv(char *name, size_t name_len)
|
||||
fcgi_request *request = (fcgi_request*) SG(server_context);
|
||||
char *ret = fcgi_getenv(request, name, (int)name_len);
|
||||
|
||||
#ifndef PHP_WIN32
|
||||
if (ret) return ret;
|
||||
/* if cgi, or fastcgi and not found in fcgi env
|
||||
check the regular environment */
|
||||
#ifndef PHP_WIN32
|
||||
return getenv(name);
|
||||
#else
|
||||
if (ret) {
|
||||
/* The functions outside here don't know, where does it come
|
||||
from. They'll need to free the returned memory as it's
|
||||
not necessary from the fcgi env. */
|
||||
return strdup(ret);
|
||||
}
|
||||
/* if cgi, or fastcgi and not found in fcgi env
|
||||
check the regular environment */
|
||||
return cgi_getenv_win32(name, name_len);
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user