summaryrefslogtreecommitdiffstats
path: root/Python/pythonrun.c
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2006-03-26 23:27:58 (GMT)
committerTim Peters <tim.peters@gmail.com>2006-03-26 23:27:58 (GMT)
commitc9d78aa4709f5a0134bfbf280f637d96e7a6cabd (patch)
tree28858dde35c06e2baaedcc99d243ed7d35dd1e70 /Python/pythonrun.c
parent1c168d8eebd927d95f069848568262ebc0b90cd6 (diff)
downloadcpython-c9d78aa4709f5a0134bfbf280f637d96e7a6cabd.zip
cpython-c9d78aa4709f5a0134bfbf280f637d96e7a6cabd.tar.gz
cpython-c9d78aa4709f5a0134bfbf280f637d96e7a6cabd.tar.bz2
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE} to PyObject_{Free, FREE} in a release build. They're aliases for the system free() now. _subprocess.c/sp_handle_dealloc(): Since the memory was originally obtained via PyObject_NEW, it must be released via PyObject_FREE (or _DEL). pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of PyObject vs PyMem mismatches in these -- it's like the specific function called at each site was picked at random, sometimes even with memory obtained via PyMem getting released via PyObject. Changed most to use PyObject uniformly, since the blobs allocated are predictably small in most cases, and obmalloc is generally faster than system mallocs then. If extension modules in real life prove as sloppy as Python's front end, we'll have to revert the objimpl.h + pymem.h part of this patch. Note that no problems will show up in a debug build (all calls still go thru obmalloc then). Problems will show up only in a release build, most likely segfaults.
Diffstat (limited to 'Python/pythonrun.c')
-rw-r--r--Python/pythonrun.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 7b1f264..cd22942 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1457,7 +1457,7 @@ err_input(perrdetail *err)
v = Py_BuildValue("(ziiz)", err->filename,
err->lineno, err->offset, err->text);
if (err->text != NULL) {
- PyMem_DEL(err->text);
+ PyObject_FREE(err->text);
err->text = NULL;
}
w = NULL;