Proper fix for bug #37707 ("clone $x" must call __clone() enven if result value is...

diff --git a/Zend/tests/bug37707.phpt b/Zend/tests/bug37707.phpt
index 3657fec989db86f4593e531095f35ec45d522729..1964958526b76abde03a7fce0093f67dbb720c68 100755 (executable)
--- a/Zend/tests/bug37707.phpt
+++ b/Zend/tests/bug37707.phpt
@@ -2,10 +2,15 @@
 Bug #37707 (clone without assigning leaks memory)
 --FILE--
 <?php
-class testme {}
+class testme {
+       function __clone() {
+               echo "clonned\n";
+       }
+}
 clone new testme();
 echo "NO LEAK\n";
 ?>
 --EXPECT--
+clonned
 NO LEAK
 

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 0db6bcda8e1a4cfaaea418a21c3e1c3708ea547d..1d53ed9fb18b3bc35aa11f3e909b046f084d4ce1 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2536,12 +2536,15 @@ ZEND_VM_HANDLER(110, ZEND_CLONE, CONST|TMP|VAR|UNUSED|CV, ANY)
        }
 
        EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
-       if (!EG(exception) && RETURN_VALUE_USED(opline)) {
+       if (!EG(exception)) {
                ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr);
                Z_OBJVAL_P(EX_T(opline->result.u.var).var.ptr) = clone_call(obj TSRMLS_CC);
                Z_TYPE_P(EX_T(opline->result.u.var).var.ptr) = IS_OBJECT;
                EX_T(opline->result.u.var).var.ptr->refcount=1;
                EX_T(opline->result.u.var).var.ptr->is_ref=1;
+               if (!RETURN_VALUE_USED(opline)) {
+                       zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr);
+               }
        }
        FREE_OP1_IF_VAR();
        ZEND_VM_NEXT_OPCODE();

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index cfb01b12a5961b67ae23ed0666551177eb2bd499..ba769218beabc83684f9d4c3612d2996a0195f9d 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1781,12 +1781,15 @@ static int ZEND_CLONE_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
-       if (!EG(exception) && RETURN_VALUE_USED(opline)) {
+       if (!EG(exception)) {
                ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr);
                Z_OBJVAL_P(EX_T(opline->result.u.var).var.ptr) = clone_call(obj TSRMLS_CC);
                Z_TYPE_P(EX_T(opline->result.u.var).var.ptr) = IS_OBJECT;
                EX_T(opline->result.u.var).var.ptr->refcount=1;
                EX_T(opline->result.u.var).var.ptr->is_ref=1;
+               if (!RETURN_VALUE_USED(opline)) {
+                       zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr);
+               }
        }
 
        ZEND_VM_NEXT_OPCODE();
@@ -4334,12 +4337,15 @@ static int ZEND_CLONE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
-       if (!EG(exception) && RETURN_VALUE_USED(opline)) {
+       if (!EG(exception)) {
                ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr);
                Z_OBJVAL_P(EX_T(opline->result.u.var).var.ptr) = clone_call(obj TSRMLS_CC);
                Z_TYPE_P(EX_T(opline->result.u.var).var.ptr) = IS_OBJECT;
                EX_T(opline->result.u.var).var.ptr->refcount=1;
                EX_T(opline->result.u.var).var.ptr->is_ref=1;
+               if (!RETURN_VALUE_USED(opline)) {
+                       zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr);
+               }
        }
 
        ZEND_VM_NEXT_OPCODE();
@@ -7484,12 +7490,15 @@ static int ZEND_CLONE_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
-       if (!EG(exception) && RETURN_VALUE_USED(opline)) {
+       if (!EG(exception)) {
                ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr);
                Z_OBJVAL_P(EX_T(opline->result.u.var).var.ptr) = clone_call(obj TSRMLS_CC);
                Z_TYPE_P(EX_T(opline->result.u.var).var.ptr) = IS_OBJECT;
                EX_T(opline->result.u.var).var.ptr->refcount=1;
                EX_T(opline->result.u.var).var.ptr->is_ref=1;
+               if (!RETURN_VALUE_USED(opline)) {
+                       zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr);
+               }
        }
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
@@ -14659,12 +14668,15 @@ static int ZEND_CLONE_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
-       if (!EG(exception) && RETURN_VALUE_USED(opline)) {
+       if (!EG(exception)) {
                ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr);
                Z_OBJVAL_P(EX_T(opline->result.u.var).var.ptr) = clone_call(obj TSRMLS_CC);
                Z_TYPE_P(EX_T(opline->result.u.var).var.ptr) = IS_OBJECT;
                EX_T(opline->result.u.var).var.ptr->refcount=1;
                EX_T(opline->result.u.var).var.ptr->is_ref=1;
+               if (!RETURN_VALUE_USED(opline)) {
+                       zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr);
+               }
        }
 
        ZEND_VM_NEXT_OPCODE();
@@ -20211,12 +20223,15 @@ static int ZEND_CLONE_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
-       if (!EG(exception) && RETURN_VALUE_USED(opline)) {
+       if (!EG(exception)) {
                ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr);
                Z_OBJVAL_P(EX_T(opline->result.u.var).var.ptr) = clone_call(obj TSRMLS_CC);
                Z_TYPE_P(EX_T(opline->result.u.var).var.ptr) = IS_OBJECT;
                EX_T(opline->result.u.var).var.ptr->refcount=1;
                EX_T(opline->result.u.var).var.ptr->is_ref=1;
+               if (!RETURN_VALUE_USED(opline)) {
+                       zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr);
+               }
        }
 
        ZEND_VM_NEXT_OPCODE();