summaryrefslogtreecommitdiff
path: root/Zend/zend_API.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-12-10 20:30:39 +0800
committerXinchen Hui <laruence@php.net>2012-12-10 20:30:39 +0800
commit70b65f310016d3b777da4bd0ceb6f775658c4590 (patch)
tree827f0e2116142891138099a326e0a11999a3c4f6 /Zend/zend_API.c
parent4e7db3ecbc4ae9e24bdb72403867ac5c7c153345 (diff)
parent3d86e6d881a5f425c3b37a85ea7f1eb5acd12b18 (diff)
downloadphp-git-70b65f310016d3b777da4bd0ceb6f775658c4590.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'Zend/zend_API.c')
-rw-r--r--Zend/zend_API.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index c3d62c2729..6dadd4d060 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -3708,6 +3708,8 @@ ZEND_API int zend_update_static_property(zend_class_entry *scope, const char *na
(*property)->value = value->value;
if (Z_REFCOUNT_P(value) > 0) {
zval_copy_ctor(*property);
+ } else {
+ efree(value);
}
} else {
zval *garbage = *property;