SF bug #1331563 ] string_subscript doesn't check for failed PyMem_Malloc. Will backport

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 5797eb91efce5034af7ae9aea7563d11d9789212..78560de9d6bcf4ea2557cc37ac57cca66c64945a 100644 (file)
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1198,6 +1198,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++) {