com php-src: Fixed possible double free: Zend/zend_builtin_ functions.c
| From: | Dmitry Stogov | Date: | Tue, 13 Jan 2015 08:32:36 +0000 |
| Subject: | com php-src: Fixed possible double free: Zend/zend_builtin_ functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84080@lists.php.net to get a copy of this message | ||
Commit: 58efbf0a922affe880561a226dcbd679300ff938
Author: Dmitry Stogov <dmitry@zend.com> Tue, 13 Jan 2015 11:32:36 +0300
Parents: 7e93de101ff2c3924472640844895334889f0dab
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=58efbf0a922affe880561a226dcbd679300ff938
Log:
Fixed possible double free
Changed paths:
M Zend/zend_builtin_functions.c
Diff:
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 223547f..474b748 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -704,7 +704,7 @@ ZEND_FUNCTION(error_reporting)
p->orig_modifiable = p->modifiable;
p->modified = 1;
}
- } else if (p->value) {
+ } else if (p->orig_value != p->value) {
zend_string_release(p->value);
}