diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2021-02-10 23:55:59 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2021-02-10 23:55:59 +0300 |
| commit | b113f7e88e742f64b810b6972f5bb5fbdbfc9946 (patch) | |
| tree | 6c61bfb17da6b43a5b7835f8990838d37ed917a0 /ext/opcache/zend_file_cache.c | |
| parent | ef5164818576d75929834d9f0c15cdfc095f7139 (diff) | |
| download | php-git-b113f7e88e742f64b810b6972f5bb5fbdbfc9946.tar.gz | |
Unserialize op_array->scope before passing to zend_file_cache_unserialize_type().
Don't use scope of closures.
Diffstat (limited to 'ext/opcache/zend_file_cache.c')
| -rw-r--r-- | ext/opcache/zend_file_cache.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/opcache/zend_file_cache.c b/ext/opcache/zend_file_cache.c index d62fabb8d5..4ebb23fb84 100644 --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c @@ -1352,6 +1352,8 @@ static void zend_file_cache_unserialize_op_array(zend_op_array *op_arr opline++; } + UNSERIALIZE_PTR(op_array->scope); + if (op_array->arg_info) { zend_arg_info *p, *end; UNSERIALIZE_PTR(op_array->arg_info); @@ -1367,7 +1369,7 @@ static void zend_file_cache_unserialize_op_array(zend_op_array *op_arr if (!IS_UNSERIALIZED(p->name)) { UNSERIALIZE_STR(p->name); } - zend_file_cache_unserialize_type(&p->type, op_array->scope, script, buf); + zend_file_cache_unserialize_type(&p->type, (op_array->fn_flags & ZEND_ACC_CLOSURE) ? NULL : op_array->scope, script, buf); p++; } } @@ -1389,7 +1391,6 @@ static void zend_file_cache_unserialize_op_array(zend_op_array *op_arr UNSERIALIZE_STR(op_array->function_name); UNSERIALIZE_STR(op_array->filename); UNSERIALIZE_PTR(op_array->live_range); - UNSERIALIZE_PTR(op_array->scope); UNSERIALIZE_STR(op_array->doc_comment); UNSERIALIZE_ATTRIBUTES(op_array->attributes); UNSERIALIZE_PTR(op_array->try_catch_array); |