Disallow 'yield' in a 'try' block when there's a 'finally' clause.
Derived from Thomas Wouters's patch on the Iterators list, but doesn't
try to read c->c_block[c->c_nblocks].
diff --git a/Python/compile.c b/Python/compile.c
index 6c13bb9..843cf09 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -2659,10 +2659,20 @@
static void
com_yield_stmt(struct compiling *c, node *n)
{
+ int i;
REQ(n, yield_stmt); /* 'yield' testlist */
if (!c->c_infunction) {
com_error(c, PyExc_SyntaxError, "'yield' outside function");
}
+
+ for (i = 0; i < c->c_nblocks; ++i) {
+ if (c->c_block[i] == SETUP_FINALLY) {
+ com_error(c, PyExc_SyntaxError,
+ "'yield' not allowed in a 'try' block "
+ "with a 'finally' clause");
+ return;
+ }
+ }
com_node(c, CHILD(n, 1));
com_addbyte(c, YIELD_VALUE);
com_pop(c, 1);