From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Sun, 21 Oct 2001 05:57:28 +0000 (+0000)
Subject: Backport fix from 2.277 - incorrectly swapped arguments to PyFrame_BlockSetup.
X-Git-Tag: v2.1.2c1~102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc009f3237daa485d292268db8bd6a97290faaf1;p=thirdparty%2FPython%2Fcpython.git

Backport fix from 2.277 - incorrectly swapped arguments to PyFrame_BlockSetup.
Fixes very obscure and nasty bug.
---

diff --git a/Python/ceval.c b/Python/ceval.c
index 690c65357249..ccab1585679b 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2196,8 +2196,8 @@ eval_code2(PyCodeObject *co, PyObject *globals, PyObject *locals,
 			if (b->b_type == SETUP_LOOP && why == WHY_CONTINUE) {
 				/* For a continue inside a try block,
 				   don't pop the block for the loop. */
-				PyFrame_BlockSetup(f, b->b_type, b->b_level,
-						   b->b_handler);
+				PyFrame_BlockSetup(f, b->b_type, b->b_handler,
+						   b->b_level);
 				why = WHY_NOT;
 				JUMPTO(PyInt_AS_LONG(retval));
 				Py_DECREF(retval);