mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 02:15:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1'

Browse Source 
* PHP-8.1:
  Fix potential use after free in php_binary_init()
This commit is contained in:
Christoph M. Becker 2022-06-20 12:03:47 +02:00
commit 640c1c3a09
No known key found for this signature in database
GPG Key ID: D66C9593118BCCB6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main/main.c
View File

@ -348,15 +348,15 @@ static void php_binary_init(void)
{
char *binary_location = NULL;
#ifdef PHP_WIN32
binary_location = (char *)malloc(MAXPATHLEN);
if (binary_location && GetModuleFileName(0, binary_location, MAXPATHLEN) == 0) {
free(binary_location);
PG(php_binary) = NULL;
binary_location = (char *)pemalloc(MAXPATHLEN, 1);
if (GetModuleFileName(0, binary_location, MAXPATHLEN) == 0) {
pefree(binary_location, 1);
binary_location = NULL;
}
#else
if (sapi_module.executable_location) {
binary_location = (char *)malloc(MAXPATHLEN);
if (binary_location && !strchr(sapi_module.executable_location, '/')) {
binary_location = (char *)pemalloc(MAXPATHLEN, 1);
if (!strchr(sapi_module.executable_location, '/')) {
char *envpath, *path;
bool found = false;
@ -379,11 +379,11 @@ static void php_binary_init(void)
efree(path);
}
if (!found) {
free(binary_location);
pefree(binary_location, 1);
binary_location = NULL;
}
} else if (!VCWD_REALPATH(sapi_module.executable_location, binary_location) || VCWD_ACCESS(binary_location, X_OK)) {
free(binary_location);
pefree(binary_location, 1);
binary_location = NULL;
}
}