From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Nov 2009 15:06:45 +0000 (+0000)
Subject: prevent a rather unlikely segfault
X-Git-Tag: v2.7a1~159
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2caf1f60ec182558de96526cae12962926ae92a;p=thirdparty%2FPython%2Fcpython.git

prevent a rather unlikely segfault
---

diff --git a/Objects/listobject.c b/Objects/listobject.c
index c5b147580292..39b8b1a882c2 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -183,9 +183,12 @@ PyList_GetItem(PyObject *op, Py_ssize_t i)
 		return NULL;
 	}
 	if (i < 0 || i >= Py_SIZE(op)) {
-		if (indexerr == NULL)
+		if (indexerr == NULL) {
 			indexerr = PyString_FromString(
 				"list index out of range");
+			if (indexerr == NULL)
+				return NULL;
+		}
 		PyErr_SetObject(PyExc_IndexError, indexerr);
 		return NULL;
 	}
@@ -447,9 +450,12 @@ static PyObject *
 list_item(PyListObject *a, Py_ssize_t i)
 {
 	if (i < 0 || i >= Py_SIZE(a)) {
-		if (indexerr == NULL)
+		if (indexerr == NULL) {
 			indexerr = PyString_FromString(
 				"list index out of range");
+			if (indexerr == NULL)
+				return NULL;
+		}
 		PyErr_SetObject(PyExc_IndexError, indexerr);
 		return NULL;
 	}