Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 23:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

SyntaxError__str__(): Fix two memory problems discovered by Insure.

Browse source 
First, the allocated buffer was never freed after using it to create
the PyString object.  Second, it was possible that have_filename would
be false (meaning that filename was not a PyString object), but that
the code would still try to PyString_GET_SIZE() it.
This commit is contained in:
Barry Warsaw 2000-08-16 19:43:17 +00:00
parent 9f6e6c63ef
commit 77c9f50422
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Python/exceptions.c
View file

@ -775,18 +775,20 @@ SyntaxError__str__(PyObject *self, PyObject *args)
int have_lineno = 0;
char *buffer = NULL;
if (filename = PyObject_GetAttrString(self, "filename"))
if ((filename = PyObject_GetAttrString(self, "filename")) != NULL)
have_filename = PyString_Check(filename);
else
PyErr_Clear();
if (lineno = PyObject_GetAttrString(self, "lineno"))
if ((lineno = PyObject_GetAttrString(self, "lineno")) != NULL)
have_lineno = PyInt_Check(lineno);
else
PyErr_Clear();
if (have_filename || have_lineno) {
int bufsize = (PyString_GET_SIZE(str) + 64 +
PyString_GET_SIZE(filename));
int bufsize = PyString_GET_SIZE(str) + 64;
if (have_filename)
bufsize += PyString_GET_SIZE(filename);
buffer = PyMem_Malloc(bufsize);
if (buffer != NULL) {
@ -803,7 +805,10 @@ SyntaxError__str__(PyObject *self, PyObject *args)
sprintf(buffer, "%s (line %d)",
PyString_AS_STRING(str),
PyInt_AsLong(lineno));
result = PyString_FromString(buffer);
PyMem_FREE(buffer);
if (result == NULL)
result = str;
else