php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
If a ref has to be added it will be already added while walking the call
slots.
This commit is contained in:
Nikita Popov
2012-12-20 20:33:18 +01:00
parent d5fe89670e
commit 3e78c6ad25
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/tests/generators/clone_after_object_call.phpt
+20
View File
@@ -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
Zend/zend_generators.c
+1 -5
View File
@@ -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 */