com php-src: Fixed bug #73960: NEWS Zend/tests/bug73960.phpt Zend/zend_execute.h
| From: | Nikita Popov | Date: | Fri, 10 Mar 2017 17:20:32 +0000 |
| Subject: | com php-src: Fixed bug #73960: NEWS Zend/tests/bug73960.phpt Zend/zend_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-97284@lists.php.net to get a copy of this message | ||
Commit: 29ee3e3c49bd3b32219f45ea4d4f1263c3021150
Author: Nikita Popov <nikita.ppv@gmail.com> Thu, 9 Mar 2017 21:09:36 +0100
Parents: c398198c0a8e58bc37a441bcfbfe1eb0e8058d9f
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=29ee3e3c49bd3b32219f45ea4d4f1263c3021150
Log:
Fixed bug #73960
Bugs:
https://bugs.php.net/73960
Changed paths:
M NEWS
A Zend/tests/bug73960.phpt
M Zend/zend_execute.h
Diff:
diff --git a/NEWS b/NEWS
index 4858962..b598d4d 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ PHP NEWS
- Core:
. Fixed bug #73370 (falsely exits with "Out of Memory" when using
USE_ZEND_ALLOC=0). (Nikita)
+ .. Fixed bug #73960 (Leak with instance method calling static method with
+ referenced return). (Nikita)
- Date:
. Fixed bug #72096 (Swatch time value incorrect for dates before 1970). (mcq8)
diff --git a/Zend/tests/bug73960.phpt b/Zend/tests/bug73960.phpt
new file mode 100644
index 0000000..533c87a
--- /dev/null
+++ b/Zend/tests/bug73960.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Bug #73960: Leak with instance method calling static method with referenced return
+--FILE--
+<?php
+
+$value = 'one';
+$array = array($value);
+$array = $ref =& $array;
+var_dump($array);
+
+?>
+--EXPECT--
+array(1) {
+ [0]=>
+ string(3) "one"
+}
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index d98fe05..f010f0a 100644
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -79,6 +79,10 @@ static zend_always_inline zval* zend_assign_to_variable(zval *variable_ptr, zval
return variable_ptr;
}
if (ZEND_CONST_COND(value_type & (IS_VAR|IS_CV), 1) && variable_ptr == value) {
+ if (value_type == IS_VAR && ref) {
+ ZEND_ASSERT(GC_REFCOUNT(ref) > 1);
+ --GC_REFCOUNT(ref);
+ }
return variable_ptr;
}
garbage = Z_COUNTED_P(variable_ptr);