From fcaccbaa22784084d2cb59821b4e66c230702851 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Thu, 1 Dec 2016 15:21:28 +0100 Subject: [PATCH] Fix valgrind issue when throwing due to yield from aborted generator --- Zend/zend_generators.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index 6055e76e96..8dc9484eb0 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -519,6 +519,7 @@ ZEND_API zend_generator *zend_generator_update_current(zend_generator *generator generator->execute_fake.prev_execute_data = original_execute_data; } + root->execute_data->opline--; /* ZEND_YIELD(_FROM) already advance, so decrement opline to throw from correct place */ zend_throw_exception(zend_ce_ClosedGeneratorException, "Generator yielded from aborted, no return value available", 0); EG(current_execute_data) = original_execute_data; -- 2.40.0