summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-10-21 10:07:24 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-10-21 10:07:24 +0200
commita5597c3e8d876d838c5d2b646f34071dc81eb4d8 (patch)
tree0595d85a2623769bc7f6e93f21e928406b10cba8 /main
parent7f595ba5cee10fc5ea545e4a34fb725299e5ad3e (diff)
parent5998b2a3a65042dc7fc4f70945dd72e4e258500f (diff)
downloadphp-git-a5597c3e8d876d838c5d2b646f34071dc81eb4d8.tar.gz
Merge branch 'PHP-8.0'
* PHP-8.0: Fix invalid memory read on libpath
Diffstat (limited to 'main')
-rw-r--r--main/php_ini.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_ini.c b/main/php_ini.c
index 53c08ae3c4..52e3a20ebf 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -374,13 +374,13 @@ static void php_load_zend_extension_cb(void *arg)
efree(orig_libpath);
efree(err1);
- efree(libpath);
}
#ifdef PHP_WIN32
if (!php_win32_image_compatible(handle, &err1)) {
php_error(E_CORE_WARNING, err1);
efree(err1);
+ efree(libpath);
DL_UNLOAD(handle);
return;
}