From: Nikita Popov <nikic@php.net>
Date: Thu, 20 Dec 2012 19:33:18 +0000 (+0100)
Subject: Do not add a ref to EX(object) on generator clone
X-Git-Tag: php-5.5.0alpha3~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e78c6ad25fdf07259bfaaa3e2e33fb0914e5e61;p=php

Do not add a ref to EX(object) on generator clone

If a ref has to be added it will be already added while walking the call
slots.
---

diff --git a/Zend/tests/generators/clone_after_object_call.phpt b/Zend/tests/generators/clone_after_object_call.phpt
new file mode 100644
index 0000000000..0a424268cc
--- /dev/null
+++ b/Zend/tests/generators/clone_after_object_call.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Cloning a generator after an object method was called
+--FILE--
+<?php
+
+class A { public function b() { } }
+
+function gen() {
+    $a = new A;
+    $a->b();
+    yield;
+}
+
+$g1 = gen();
+$g1->rewind();
+$g2 = clone $g1; 
+
+echo "Done";
+--EXPECT--
+Done
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index d4254e090d..a1917416ef 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -223,6 +223,7 @@ static void zend_generator_clone_storage(zend_generator *orig, zend_generator **
 		/* copy */
 		clone->execute_data->opline = execute_data->opline;
 		clone->execute_data->function_state = execute_data->function_state;
+		clone->execute_data->object = execute_data->object;
 		clone->execute_data->current_scope = execute_data->current_scope;
 		clone->execute_data->current_called_scope = execute_data->current_called_scope;
 		clone->execute_data->fast_ret = execute_data->fast_ret;
@@ -326,11 +327,6 @@ static void zend_generator_clone_storage(zend_generator *orig, zend_generator **
 			clone->execute_data->current_this = execute_data->current_this;
 			Z_ADDREF_P(execute_data->current_this);
 		}
-
-		if (execute_data->object) {
-			clone->execute_data->object = execute_data->object;
-			Z_ADDREF_P(execute_data->object);
-		}
 	}
 
 	/* The value and key are known not to be references, so simply add refs */