com php-src: Fixed arguments unpacking segfault with opcache: ext/opcache/Optimizer/optimize_func_calls.c

From: Date: Tue, 14 Jan 2014 14:34:08 +0000
Subject: com php-src: Fixed arguments unpacking segfault with opcache: ext/opcache/Optimizer/optimize_func_calls.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-75619@lists.php.net to get a copy of this message
Commit: a5ee337156027e06966586984eff15e19efbf3cd Author: Nikita Popov <nikic@php.net> Tue, 14 Jan 2014 22:34:08 +0800 Committer: Xinchen Hui <laruence@php.net> Tue, 14 Jan 2014 22:34:08 +0800 Parents: 58dff7cee52c3df839517aa3eb3da6c4d0f23066 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a5ee337156027e06966586984eff15e19efbf3cd Log: Fixed arguments unpacking segfault with opcache Changed paths: M ext/opcache/Optimizer/optimize_func_calls.c Diff: diff --git a/ext/opcache/Optimizer/optimize_func_calls.c b/ext/opcache/Optimizer/optimize_func_calls.c index 98bfc1e..9861930 100644 --- a/ext/opcache/Optimizer/optimize_func_calls.c +++ b/ext/opcache/Optimizer/optimize_func_calls.c @@ -126,7 +126,12 @@ static void optimize_func_calls(zend_op_array *op_array, zend_persistent_script call_stack[call - 1].opline = NULL; } break; - +#if ZEND_EXTENSION_API_NO >= PHP_5_6_X_API_NO + case ZEND_SEND_UNPACK: + call_stack[call - 1].func = NULL; + call_stack[call - 1].opline = NULL; + break; +#endif default: break; }

« previous php.cvs (#75619) next »