com php-src: Fixed segfault while running with moodle: ext/opcache/Optimizer/block_pass.c
| From: | Xinchen Hui | Date: | Thu, 22 Jan 2015 08:38:34 +0000 |
| Subject: | com php-src: Fixed segfault while running with moodle: ext/opcache/Optimizer/block_pass.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84300@lists.php.net to get a copy of this message | ||
Commit: 251745c012a42ca131767d02d06ef373a790e115
Author: Xinchen Hui <laruence@php.net> Thu, 22 Jan 2015 16:38:34 +0800
Parents: 88f2321a25d040641cfbe3be1c37c2903e6e0cd9
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=251745c012a42ca131767d02d06ef373a790e115
Log:
Fixed segfault while running with moodle
Changed paths:
M ext/opcache/Optimizer/block_pass.c
Diff:
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
index 79eee8b..bbdddec 100644
--- a/ext/opcache/Optimizer/block_pass.c
+++ b/ext/opcache/Optimizer/block_pass.c
@@ -381,7 +381,7 @@ static inline void del_source(zend_code_block *from, zend_code_block *to)
return;
}
- if (to->sources->next == NULL) {
+ if (!to->protected && to->sources->next == NULL) {
/* source to only one block */
zend_code_block *from_block = to->sources->from;