traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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
Show Stats 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;
newsize = PyUnicode_GET_SIZE(listrepr);
result = PyUnicode_FromUnicode(NULL, newsize);
if (result) {
u = PyUnicode_AS_UNICODE(result);
*u++ = '{';
/* Omit the brackets from the listrepr */
Py_UNICODE_COPY(u, PyUnicode_AS_UNICODE(listrepr)+1,
newsize-2);
u += newsize-2;
*u = '}';
}
if (result == NULL)
goto done;
u = PyUnicode_AS_UNICODE(result);
*u++ = '{';
/* Omit the brackets from the listrepr */
Py_UNICODE_COPY(u, PyUnicode_AS_UNICODE(listrepr)+1,
newsize-2);
u += newsize-2;
*u = '}';
Py_DECREF(listrepr);
if (Py_TYPE(so) != &PySet_Type) {
PyObject *tmp = PyUnicode_FromFormat("%s(%U)",
Py_TYPE(so)->tp_name,