php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0'

Browse Source 
* PHP-7.0:
  Update NEWS: "Fixed bug  #71584 (Possible use-after-free of ZCG(cwd) in Zend Opcache)"
  Fix use-after-free of ZCG(cwd) in Zend Optimizer
This commit is contained in:
Xinchen Hui
2016-02-15 10:33:18 +08:00
parent c3fcc3e9ac 8974e4c781
commit be91106db7
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ext/opcache/ZendAccelerator.c
View File

@@ -2284,6 +2284,11 @@ static void accel_deactivate(void)
* the script is aborted abnormally, they may become messed up.
*/
if (ZCG(cwd)) {
zend_string_release(ZCG(cwd));
ZCG(cwd) = NULL;
}
if (!ZCG(enabled) || !accel_startup_ok) {
return;
}
@@ -2297,12 +2302,6 @@ static void accel_deactivate(void)
zend_accel_fast_shutdown();
}
#endif
if (ZCG(cwd)) {
zend_string_release(ZCG(cwd));
ZCG(cwd) = NULL;
}
}
static int accelerator_remove_cb(zend_extension *element1, zend_extension *element2)