From 5f7e8dab11cab6a19a454ee7d3567e5f61a4e43c Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sun, 2 Dec 2012 07:56:42 +0100
Subject: [PATCH] Issue #16592: stringlib_bytes_join doesn't raise MemoryError
 on allocation failure

---
 Misc/NEWS                | 3 +++
 Objects/stringlib/join.h | 1 +
 2 files changed, 4 insertions(+)

diff --git a/Misc/NEWS b/Misc/NEWS
index 739a5eac7d3..11a313f6aae 100644
--- 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
index d1d6e532c57..5568b31dab8 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;
         }
     }