(original) (raw)

changeset: 80672:9af5a2611202 user: Christian Heimes christian@cheimes.de date: Sun Dec 02 07:56:42 2012 +0100 files: Misc/NEWS Objects/stringlib/join.h description: Issue #16592: stringlib_bytes_join doesn't raise MemoryError on allocation failure diff -r 50af56c27b9a -r 9af5a2611202 Misc/NEWS --- a/Misc/NEWS Sun Dec 02 07:37:35 2012 +0100 +++ b/Misc/NEWS Sun Dec 02 07:56:42 2012 +0100 @@ -10,6 +10,9 @@ 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 -r 50af56c27b9a -r 9af5a2611202 Objects/stringlib/join.h --- a/Objects/stringlib/join.h Sun Dec 02 07:37:35 2012 +0100 +++ b/Objects/stringlib/join.h Sun Dec 02 07:56:42 2012 +0100 @@ -43,6 +43,7 @@ buffers = PyMem_NEW(Py_buffer, seqlen); if (buffers == NULL) { Py_DECREF(seq); + PyErr_NoMemory(); return NULL; } } /christian@cheimes.de