]> granicus.if.org Git - php/commitdiff
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function...
authorXinchen Hui <laruence@php.net>
Tue, 26 Mar 2013 04:02:48 +0000 (12:02 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 26 Mar 2013 04:02:48 +0000 (12:02 +0800)
NEWS
Zend/tests/bug64515.phpt [new file with mode: 0644]
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

diff --git a/NEWS b/NEWS
index 09ce1d1382594d3eb000ea22230756ac142856d3..e33c7a389c80663452262caecabcc0fe5fc9d2bc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? 20??, PHP 5.5.0 Beta 2
 
 - Core:
+  . Fixed bug #64515 (Memoryleak when using the same variablename 2times in
+    function declaration). (Laruence)
   . Fixed bug #64503 (Compilation fails with error: conflicting types for
     'zendparse'). (Laruence)
   . Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11).
diff --git a/Zend/tests/bug64515.phpt b/Zend/tests/bug64515.phpt
new file mode 100644 (file)
index 0000000..5390a6c
--- /dev/null
@@ -0,0 +1,12 @@
+--TEST--
+Bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
+--FILE--
+<?php
+function foo($unused = null, $unused = null, $arg = array()) {
+           return 1;
+}
+foo();
+echo "okey";
+?>
+--EXPECT--
+okey
index 31a5facb526a0ce3a8006dbd469b1eea97f807a5..7371d0e4404d62661426c4a13c71f3852263d38d 100644 (file)
@@ -3262,7 +3262,7 @@ ZEND_VM_HANDLER(64, ZEND_RECV_INIT, ANY, CONST)
 
        zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value, opline->extended_value TSRMLS_CC);
        var_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(execute_data, opline->result.var TSRMLS_CC);
-       Z_DELREF_PP(var_ptr);
+       zval_ptr_dtor(var_ptr);
        *var_ptr = assignment_value;
 
        CHECK_EXCEPTION();
index 7fe6ee1048e4736adeb248a38f61cf5ca6176d4a..8703dec2275c43d93020b9c35894ed087ee01caf 100644 (file)
@@ -1406,7 +1406,7 @@ static int ZEND_FASTCALL  ZEND_RECV_INIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_
 
        zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value, opline->extended_value TSRMLS_CC);
        var_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(execute_data, opline->result.var TSRMLS_CC);
-       Z_DELREF_PP(var_ptr);
+       zval_ptr_dtor(var_ptr);
        *var_ptr = assignment_value;
 
        CHECK_EXCEPTION();