From d9ebd0f3d696e42d7c7bd2b0176414534aed0ef1 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikic@php.net>
Date: Wed, 2 Jul 2014 17:33:31 +0200
Subject: [PATCH] Fix bug #67497: eval with parse error causes segfault in
 generator

---
 NEWS                                |  2 ++
 Zend/tests/generators/bug67497.phpt | 19 +++++++++++++++++++
 Zend/zend_generators.c              |  1 +
 3 files changed, 22 insertions(+)
 create mode 100644 Zend/tests/generators/bug67497.phpt

diff --git a/NEWS b/NEWS
index 4a848548aba..9bfa384e825 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ PHP                                                                        NEWS
     match). (Bob)
   . Fixed bug #67091 (make install fails to install libphp5.so on FreeBSD 10.0).
     (Ferenc)
+  . Fixed buf #67497 (eval with parse error causes segmentation fault in
+    generator). (Nikita)
 
 - CLI server:
   . Implemented FR #67429 (CLI server is missing some new HTTP response codes).
diff --git a/Zend/tests/generators/bug67497.phpt b/Zend/tests/generators/bug67497.phpt
new file mode 100644
index 00000000000..483857b96c3
--- /dev/null
+++ b/Zend/tests/generators/bug67497.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Bug #67467: eval with parse error causes segmentation fault in generator
+--FILE--
+<?php
+
+function gen() {
+    $a = 1;
+    yield $a;
+}
+
+@eval('abc');
+
+$values = gen();
+$values->next();
+
+?>
+===DONE===
+--EXPECT--
+===DONE===
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index a5313dc1a31..b9722b45a0c 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -125,6 +125,7 @@ ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished
 		/* A fatal error / die occurred during the generator execution. Trying to clean
 		 * up the stack may not be safe in this case. */
 		if (CG(unclean_shutdown)) {
+			generator->execute_data = NULL;
 			return;
 		}