From 2872e5b1f893c47acb0a194dbf92766ae1ff9e37 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 6 Jun 2010 20:38:02 +0000
Subject: [PATCH] convertsimple(): call PyErr_NoMemory() on PyMem_NEW() failure

Raise a more revelant error (MemoryError instead of TypeError)
---
 Python/getargs.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Python/getargs.c b/Python/getargs.c
index 1806bf87ae7..b4b5db283c6 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1172,6 +1172,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
                 *buffer = PyMem_NEW(char, size + 1);
                 if (*buffer == NULL) {
                     Py_DECREF(s);
+                    PyErr_NoMemory();
                     return converterr(
                         "(memory error)",
                         arg, msgbuf, bufsize);
@@ -1215,6 +1216,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
             *buffer = PyMem_NEW(char, size + 1);
             if (*buffer == NULL) {
                 Py_DECREF(s);
+                PyErr_NoMemory();
                 return converterr("(memory error)",
                                   arg, msgbuf, bufsize);
             }