com php-src: Fixed segfault: Zend/zend_API.c
| From: | Xinchen Hui | Date: | Mon, 29 Sep 2014 04:06:56 +0000 |
| Subject: | com php-src: Fixed segfault: Zend/zend_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82001@lists.php.net to get a copy of this message | ||
Commit: f248b17e07d6746ed1057611cae5f2d11918fb4e
Author: Xinchen Hui <laruence@php.net> Mon, 29 Sep 2014 12:06:56 +0800
Parents: 3fd8a76f268984bf9dc39e4ed57983f92da1776b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f248b17e07d6746ed1057611cae5f2d11918fb4e
Log:
Fixed segfault
Changed paths:
M Zend/zend_API.c
Diff:
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 41adbeb..7c062a1 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -3926,9 +3926,11 @@ ZEND_API int zend_update_static_property(zend_class_entry *scope, const char
*na
zval garbage;
ZVAL_COPY_VALUE(&garbage, property);
- Z_ADDREF_P(value);
- if (Z_ISREF_P(value)) {
- SEPARATE_ZVAL(value);
+ if (Z_REFCOUNTED_P(value)) {
+ Z_ADDREF_P(value);
+ if (Z_ISREF_P(value)) {
+ SEPARATE_ZVAL(value);
+ }
}
ZVAL_COPY_VALUE(property, value);
zval_ptr_dtor(&garbage);