Review

Author: arnaud-lb

Zend/zend_generators.c

@@ -328,7 +328,8 @@ static void zend_generator_dtor_storage(zend_object *object) /* {{{ */
 			Z_OBJ_P(fast_call) = NULL;
 			Z_OPLINE_NUM_P(fast_call) = (uint32_t)-1;
 
-			ex->opline = &ex->func->op_array.opcodes[try_catch->finally_op];
+			/* -1 because zend_generator_resume() will increment it */
+			ex->opline = &ex->func->op_array.opcodes[try_catch->finally_op] - 1;
 			generator->flags |= ZEND_GENERATOR_FORCED_CLOSE;
 			zend_generator_resume(generator);
 
@@ -814,20 +815,17 @@ ZEND_API void zend_generator_resume(zend_generator *orig_generator) /* {{{ */
 		zend_generator_restore_call_stack(generator);
 	}
 
-	/* Resume execution
-	 *
-	 * Increment opline to point after the CREATE_GENERATOR / YIELD / YIELD_FROM
-	 * op, unless an exception was thrown (opline is EG(exception_op)), or the
-	 * generator is being force-closed (opline points to the start of a finally
-	 * block).
-	 */
-	if (EXPECTED(generator->execute_data->opline->opcode != ZEND_HANDLE_EXCEPTION
-			&& !(generator->flags & ZEND_GENERATOR_FORCED_CLOSE))) {
-		ZEND_ASSERT(generator->execute_data->opline->opcode == ZEND_GENERATOR_CREATE
-				|| generator->execute_data->opline->opcode == ZEND_YIELD
-				|| generator->execute_data->opline->opcode == ZEND_YIELD_FROM);
-		generator->execute_data->opline++;
-	}
+	/* Resume execution */
+	ZEND_ASSERT(generator->execute_data->opline->opcode == ZEND_GENERATOR_CREATE
+			|| generator->execute_data->opline->opcode == ZEND_YIELD
+			|| generator->execute_data->opline->opcode == ZEND_YIELD_FROM
+			/* opline points to EG(exception_op), which is a sequence of
+			 * ZEND_HANDLE_EXCEPTION ops, so the following increment is safe */
+			|| generator->execute_data->opline->opcode == ZEND_HANDLE_EXCEPTION
+			/* opline points to the start of a finally block minus one op to
+			 * account for the following increment */
+			|| (generator->flags & ZEND_GENERATOR_FORCED_CLOSE));
+	generator->execute_data->opline++;
 	generator->flags |= ZEND_GENERATOR_CURRENTLY_RUNNING;
 	if (!ZEND_OBSERVER_ENABLED) {
 		zend_execute_ex(generator->execute_data);