mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

convertsimple(): call PyErr_NoMemory() on PyMem_NEW() failure

Browse source 
Raise a more revelant error (MemoryError instead of TypeError)
This commit is contained in:
Victor Stinner 2010-06-06 20:38:02 +00:00
parent 5cb6239f00
commit 2872e5b1f8
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Python/getargs.c
View file

@ -1172,6 +1172,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
*buffer = PyMem_NEW(char, size + 1); *buffer = PyMem_NEW(char, size + 1);
if (*buffer == NULL) { if (*buffer == NULL) {
Py_DECREF(s); Py_DECREF(s);
PyErr_NoMemory();
return converterr( return converterr(
"(memory error)", "(memory error)",
arg, msgbuf, bufsize); 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); *buffer = PyMem_NEW(char, size + 1);
if (*buffer == NULL) { if (*buffer == NULL) {
Py_DECREF(s); Py_DECREF(s);
PyErr_NoMemory();
return converterr("(memory error)", return converterr("(memory error)",
arg, msgbuf, bufsize); arg, msgbuf, bufsize);
} }