diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-03-09 21:09:36 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-03-10 18:20:32 +0100 |
| commit | 29ee3e3c49bd3b32219f45ea4d4f1263c3021150 (patch) | |
| tree | 565d0a91f53f68583d2d91956373b88a1731a9e3 | |
| parent | c398198c0a8e58bc37a441bcfbfe1eb0e8058d9f (diff) | |
| download | php-git-29ee3e3c49bd3b32219f45ea4d4f1263c3021150.tar.gz | |
Fixed bug #73960
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Zend/tests/bug73960.phpt | 16 | ||||
| -rw-r--r-- | Zend/zend_execute.h | 4 |
3 files changed, 22 insertions, 0 deletions
@@ -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 0000000000..533c87afb0 --- /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 d98fe05343..f010f0a45d 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); |