From: Andrew M. Kuchling <amk@amk.ca>
Date: Fri, 6 Oct 2006 19:09:36 +0000 (+0000)
Subject: [Backport r46044 | neal.norwitz]
X-Git-Tag: v2.4.4c1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bec63ce9a17022af29d6b61614f329b4f7a5bd44;p=thirdparty%2FPython%2Fcpython.git

[Backport r46044 | neal.norwitz]

Fix #132 from Coverity, retval could have been derefed
if a continue inside a try failed.
---

diff --git a/Python/ceval.c b/Python/ceval.c
index a6201b44ce77..04dda2552c38 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2142,6 +2142,10 @@ PyEval_EvalFrame(PyFrameObject *f)
 
 		case CONTINUE_LOOP:
 			retval = PyInt_FromLong(oparg);
+			if (!retval) {
+				x = NULL;
+				break;
+			}
 			why = WHY_CONTINUE;
 			goto fast_block_end;