diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-30 10:39:25 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-30 10:39:25 +0400 |
| commit | aa3ddda8e504dd2a01e6fa786efda7d3888a9241 (patch) | |
| tree | 0363ce761539012f2ae36009c65407b69722bbe2 | |
| parent | ab4c4c3970f3c9d03a4f65a923fb31618d08a2c8 (diff) | |
| download | php-git-aa3ddda8e504dd2a01e6fa786efda7d3888a9241.tar.gz | |
Fixed usage after free
| -rw-r--r-- | ext/opcache/zend_accelerator_util_funcs.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c index dbab902b26..a0bc76d994 100644 --- a/ext/opcache/zend_accelerator_util_funcs.c +++ b/ext/opcache/zend_accelerator_util_funcs.c @@ -979,7 +979,6 @@ zend_op_array* zend_accel_load_script(zend_persistent_script *persistent_script, if (zend_hash_num_elements(&persistent_script->class_table) > 0) { zend_accel_class_hash_copy(CG(class_table), &persistent_script->class_table, NULL TSRMLS_CC); } - free_persistent_script(persistent_script, 0); /* free only hashes */ } #if ZEND_EXTENSION_API_NO >= PHP_5_3_X_API_NO @@ -991,6 +990,10 @@ zend_op_array* zend_accel_load_script(zend_persistent_script *persistent_script, } #endif + if (!from_shared_memory) { + free_persistent_script(persistent_script, 0); /* free only hashes */ + } + return op_array; } |