summaryrefslogtreecommitdiff
path: root/Python/getargs.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-06-06 20:38:02 +0000
committerVictor Stinner <victor.stinner@haypocalc.com>2010-06-06 20:38:02 +0000
commita12b7a5e8fa33d4f371cd34651714f027c5ea626 (patch)
treeb8c64bdf56d344b504abe47503d0d2790dc646d2 /Python/getargs.c
parentdd156c4f9dd2cb07ac485895245f7c142fd2feb8 (diff)
downloadcpython-a12b7a5e8fa33d4f371cd34651714f027c5ea626.tar.gz
convertsimple(): call PyErr_NoMemory() on PyMem_NEW() failure
Raise a more revelant error (MemoryError instead of TypeError)
Diffstat (limited to 'Python/getargs.c')
-rw-r--r--Python/getargs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Python/getargs.c b/Python/getargs.c
index 1806bf87ae..b4b5db283c 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);
}