diff options
author | Christian Heimes <christian@cheimes.de> | 2012-12-02 07:56:42 +0100 |
---|---|---|
committer | Christian Heimes <christian@cheimes.de> | 2012-12-02 07:56:42 +0100 |
commit | 5f7e8dab11cab6a19a454ee7d3567e5f61a4e43c (patch) | |
tree | 841cde0e17b543c492043708b2aae1bbc98afbd3 | |
parent | 17ad40e46e2bae1ae12ddbf563f6a95e72d304af (diff) | |
download | cpython-git-5f7e8dab11cab6a19a454ee7d3567e5f61a4e43c.tar.gz |
Issue #16592: stringlib_bytes_join doesn't raise MemoryError on allocation failure
-rw-r--r-- | Misc/NEWS | 3 | ||||
-rw-r--r-- | Objects/stringlib/join.h | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -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 index d1d6e532c5..5568b31dab 100644 --- 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; } } |