Issue #16592: stringlib_bytes_join doesn't raise MemoryError on allocation failure

tiran · tiran · commit 5f7e8dab11ca · 2012-12-02T07:56:42.000+01:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #16592: stringlib_bytes_join doesn't raise MemoryError on allocation
+  failure.
+
 - Issue #16546: Fix: ast.YieldFrom argument is now mandatory.
 
 - Issue #16514: Fix regression causing a traceback when sys.path[0] is None
diff --git a/Objects/stringlib/join.h b/Objects/stringlib/join.h
@@ -43,6 +43,7 @@ STRINGLIB(bytes_join)(PyObject *sep, PyObject *iterable)
         buffers = PyMem_NEW(Py_buffer, seqlen);
         if (buffers == NULL) {
             Py_DECREF(seq);
+            PyErr_NoMemory();
             return NULL;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ STRINGLIB(bytes_join)(PyObject sep, PyObject iterable)`
`43`	`43`	`buffers = PyMem_NEW(Py_buffer, seqlen);`
`44`	`44`	`if (buffers == NULL) {`
`45`	`45`	`Py_DECREF(seq);`
	`46`	`+ PyErr_NoMemory();`
`46`	`47`	`return NULL;`
`47`	`48`	`}`
`48`	`49`	`}`