mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure memory is freed on error in complex_subtype_from_string.

This commit is contained in:
Mark Dickinson 2009-10-26 22:05:06 +00:00
parent f972488213
commit 1daebdf82c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Objects/complexobject.c
View File

@ -750,10 +750,8 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
if (PyUnicode_EncodeDecimal(PyUnicode_AS_UNICODE(v), if (PyUnicode_EncodeDecimal(PyUnicode_AS_UNICODE(v),
PyUnicode_GET_SIZE(v), PyUnicode_GET_SIZE(v),
s_buffer, s_buffer,
NULL)) { NULL))
PyMem_FREE(s_buffer); goto error;
return NULL;
}
s = s_buffer; s = s_buffer;
len = strlen(s); len = strlen(s);
} }
@ -802,7 +800,7 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
if (PyErr_ExceptionMatches(PyExc_ValueError)) if (PyErr_ExceptionMatches(PyExc_ValueError))
PyErr_Clear(); PyErr_Clear();
else else
return NULL; goto error;
} }
if (end != s) { if (end != s) {
/* all 4 forms starting with <float> land here */ /* all 4 forms starting with <float> land here */
@ -815,7 +813,7 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
if (PyErr_ExceptionMatches(PyExc_ValueError)) if (PyErr_ExceptionMatches(PyExc_ValueError))
PyErr_Clear(); PyErr_Clear();
else else
return NULL; goto error;
} }
if (end != s) if (end != s)
/* <float><signed-float>j */ /* <float><signed-float>j */
@ -875,10 +873,11 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
return complex_subtype_from_doubles(type, x, y); return complex_subtype_from_doubles(type, x, y);
parse_error: parse_error:
if (s_buffer)
PyMem_FREE(s_buffer);
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"complex() arg is a malformed string"); "complex() arg is a malformed string");
error:
if (s_buffer)
PyMem_FREE(s_buffer);
return NULL; return NULL;
} }