diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-04 22:01:47 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-04 22:01:47 (GMT) |
| commit | 26c966b91d4e87b15efb3ec0a01db34f06ff895a (patch) | |
| tree | dc05c8fc3f4648ed771813881d66fb2f216aba97 | |
| parent | 9fc20536a42c0930d300e47716c87acae450eddd (diff) | |
| download | cpython-26c966b91d4e87b15efb3ec0a01db34f06ff895a.zip cpython-26c966b91d4e87b15efb3ec0a01db34f06ff895a.tar.gz cpython-26c966b91d4e87b15efb3ec0a01db34f06ff895a.tar.bz2 | |
Merged revisions 78664 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r78664 | victor.stinner | 2010-03-04 22:59:53 +0100 (jeu., 04 mars 2010) | 3 lines
Issue #3299: replace PyObject_DEL() by Py_DECREF() in _sre module to fix a
crash in pydebug mode.
........
| -rw-r--r-- | Lib/test/test_re.py | 1 | ||||
| -rw-r--r-- | Modules/_sre.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index 1626c80..99cc47b 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -706,6 +706,7 @@ class ReTests(unittest.TestCase): long_overflow = 2**128 self.assertRaises(TypeError, re.finditer, "a", {}) self.assertRaises(OverflowError, _sre.compile, "abc", 0, [long_overflow]) + self.assertRaises(TypeError, _sre.compile, {}, 0, []) def run_re_tests(): from test.re_tests import benchmarks, tests, SUCCEED, FAIL, SYNTAX_ERROR diff --git a/Modules/_sre.c b/Modules/_sre.c index 74d9425..ee6a26b 100644 --- a/Modules/_sre.c +++ b/Modules/_sre.c @@ -2702,7 +2702,7 @@ _compile(PyObject* self_, PyObject* args) else { Py_ssize_t p_length; if (!getstring(pattern, &p_length, &self->charsize)) { - PyObject_DEL(self); + Py_DECREF(self); return NULL; } } |