From 2503a27ae088cf349775fa6dbd95ee1d3d764c79 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 13 Jan 2018 12:32:00 +0100 Subject: Fix invalid free --- sapi/cgi/cgi_main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index e0c0c7fd5e..b0f1c1b601 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -582,12 +582,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 } -- cgit v1.2.1