From: Neal Norwitz <nnorwitz@gmail.com>
Date: Thu, 20 Oct 2005 04:16:45 +0000 (+0000)
Subject: Backport: SF bug #1331563 ] string_subscript doesn't check for failed PyMem_Malloc.
X-Git-Tag: v2.4.3c1~238
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2b4acf494ab433cff9b97a49f679dbd2fefc3ac;p=thirdparty%2FPython%2Fcpython.git

Backport: SF bug #1331563 ] string_subscript doesn't check for failed PyMem_Malloc.
---

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index b8e5f41342c2..e7b6e69b0da0 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1184,6 +1184,8 @@ string_subscript(PyStringObject* self, PyObject* item)
 		else {
 			source_buf = PyString_AsString((PyObject*)self);
 			result_buf = PyMem_Malloc(slicelength);
+			if (result_buf == NULL)
+				return PyErr_NoMemory();
 
 			for (cur = start, i = 0; i < slicelength; 
 			     cur += step, i++) {