diff options
| author | krakjoe <krakjoe@php.net> | 2017-11-22 04:49:34 +0000 |
|---|---|---|
| committer | krakjoe <krakjoe@php.net> | 2017-11-22 04:49:34 +0000 |
| commit | fee6c812c400d5c68b8851cec2a95686dc06129b (patch) | |
| tree | 27d3847105aa3e9784e49220034bd7ce955b853d | |
| parent | 5a7459a08202a893eca6fb8dedd7b007c9c8a219 (diff) | |
| parent | 7e0feb88562c2488240664e1f6ab42f42dae3cb6 (diff) | |
| download | php-git-fee6c812c400d5c68b8851cec2a95686dc06129b.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Check for binary_location allocation failure
| -rw-r--r-- | main/main.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/main/main.c b/main/main.c index a3a726eab2..69f3765876 100644 --- a/main/main.c +++ b/main/main.c @@ -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; |