mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

set_repr(): handle correctly PyUnicode_FromUnicode() error (MemoryError)

Browse source 
Bug found by the Clang Static Analyzer.
This commit is contained in:
Victor Stinner 2011-05-26 14:24:30 +02:00
parent 5572ba7e15
commit a1a807b6ef
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Objects/setobject.c
View file

@ -607,16 +607,18 @@ set_repr(PySetObject *so)
goto done; goto done;
newsize = PyUnicode_GET_SIZE(listrepr); newsize = PyUnicode_GET_SIZE(listrepr);
result = PyUnicode_FromUnicode(NULL, newsize); result = PyUnicode_FromUnicode(NULL, newsize);
if (result) { if (result == NULL)
u = PyUnicode_AS_UNICODE(result); goto done;
*u++ = '{';
/* Omit the brackets from the listrepr */ u = PyUnicode_AS_UNICODE(result);
Py_UNICODE_COPY(u, PyUnicode_AS_UNICODE(listrepr)+1, *u++ = '{';
newsize-2); /* Omit the brackets from the listrepr */
u += newsize-2; Py_UNICODE_COPY(u, PyUnicode_AS_UNICODE(listrepr)+1,
*u = '}'; newsize-2);
} u += newsize-2;
*u = '}';
Py_DECREF(listrepr); Py_DECREF(listrepr);
if (Py_TYPE(so) != &PySet_Type) { if (Py_TYPE(so) != &PySet_Type) {
PyObject *tmp = PyUnicode_FromFormat("%s(%U)", PyObject *tmp = PyUnicode_FromFormat("%s(%U)",
Py_TYPE(so)->tp_name, Py_TYPE(so)->tp_name,