From: Neal Norwitz <nnorwitz@gmail.com>
Date: Wed, 18 Sep 2002 22:37:17 +0000 (+0000)
Subject: Two more cases of switch(PySequence_Size()) without checking for case -1.
X-Git-Tag: v2.3c1~4023
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c96ab2b61dc5b58bd9f9724c89e0d42d172662d;p=thirdparty%2FPython%2Fcpython.git

Two more cases of switch(PySequence_Size()) without checking for case -1.
(Same problem as last checkin for SF bug 610610)
Need to clear the error and proceed.

Backport candidate
---

diff --git a/Python/exceptions.c b/Python/exceptions.c
index 03affdc8431a..e4a68803eeb9 100644
--- a/Python/exceptions.c
+++ b/Python/exceptions.c
@@ -419,6 +419,9 @@ SystemExit__init__(PyObject *self, PyObject *args)
     case 1:
         code = PySequence_GetItem(args, 0);
         break;
+    case -1:
+        PyErr_Clear();
+        /* Fall through */
     default:
         Py_INCREF(args);
         code = args;
@@ -522,6 +525,10 @@ EnvironmentError__init__(PyObject *self, PyObject *args)
 	    goto finally;
 	}
 	break;
+
+    case -1:
+	PyErr_Clear();
+	break;
     }
 
     Py_INCREF(Py_None);