summaryrefslogtreecommitdiffstats
path: root/Modules/regexmodule.c
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2002-04-27 18:44:32 (GMT)
committerTim Peters <tim.peters@gmail.com>2002-04-27 18:44:32 (GMT)
commit5de9842b34cbefbfe74e6a99004616352f223133 (patch)
treea4e980e6833ab279d0eff942e6c9cbcfaf1f4d63 /Modules/regexmodule.c
parent602f740bc2da44ce25c22b7b4b5a7a4fb3435a5a (diff)
downloadcpython-5de9842b34cbefbfe74e6a99004616352f223133.zip
cpython-5de9842b34cbefbfe74e6a99004616352f223133.tar.gz
cpython-5de9842b34cbefbfe74e6a99004616352f223133.tar.bz2
Repair widespread misuse of _PyString_Resize. Since it's clear people
don't understand how this function works, also beefed up the docs. The most common usage error is of this form (often spread out across gotos): if (_PyString_Resize(&s, n) < 0) { Py_DECREF(s); s = NULL; goto outtahere; } The error is that if _PyString_Resize runs out of memory, it automatically decrefs the input string object s (which also deallocates it, since its refcount must be 1 upon entry), and sets s to NULL. So if the "if" branch ever triggers, it's an error to call Py_DECREF(s): s is already NULL! A correct way to write the above is the simpler (and intended) if (_PyString_Resize(&s, n) < 0) goto outtahere; Bugfix candidate.
Diffstat (limited to 'Modules/regexmodule.c')
-rw-r--r--Modules/regexmodule.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/Modules/regexmodule.c b/Modules/regexmodule.c
index d449604..4c7035e 100644
--- a/Modules/regexmodule.c
+++ b/Modules/regexmodule.c
@@ -516,11 +516,8 @@ symcomp(PyObject *pattern, PyObject *gdict)
return NULL;
}
/* _PyString_Resize() decrements npattern on failure */
- if (_PyString_Resize(&npattern, n - v) == 0)
- return npattern;
- else {
- return NULL;
- }
+ _PyString_Resize(&npattern, n - v);
+ return npattern;
}