mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Check for binary_location allocation failure
This commit is contained in:
commit
fee6c812c4
@ -276,17 +276,17 @@ static void php_disable_classes(void)
|
||||
*/
|
||||
static void php_binary_init(void)
|
||||
{
|
||||
char *binary_location;
|
||||
char *binary_location = NULL;
|
||||
#ifdef PHP_WIN32
|
||||
binary_location = (char *)malloc(MAXPATHLEN);
|
||||
if (GetModuleFileName(0, binary_location, MAXPATHLEN) == 0) {
|
||||
if (binary_location && GetModuleFileName(0, binary_location, MAXPATHLEN) == 0) {
|
||||
free(binary_location);
|
||||
PG(php_binary) = NULL;
|
||||
}
|
||||
#else
|
||||
if (sapi_module.executable_location) {
|
||||
binary_location = (char *)malloc(MAXPATHLEN);
|
||||
if (!strchr(sapi_module.executable_location, '/')) {
|
||||
if (binary_location && !strchr(sapi_module.executable_location, '/')) {
|
||||
char *envpath, *path;
|
||||
int found = 0;
|
||||
|
||||
@ -316,8 +316,6 @@ static void php_binary_init(void)
|
||||
free(binary_location);
|
||||
binary_location = NULL;
|
||||
}
|
||||
} else {
|
||||
binary_location = NULL;
|
||||
}
|
||||
#endif
|
||||
PG(php_binary) = binary_location;
|
||||
|
Loading…
Reference in New Issue
Block a user