summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-03-04 21:59:53 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-03-04 21:59:53 (GMT)
commit5abeafbb0fed2d2034374c38bd36651cdbf550cd (patch)
treeb14deb0f3063ff7fc9ed7b9a0309ee7f93a3c2af
parentf0cbd821b9e5d0104755906fa0085bac87737e78 (diff)
downloadcpython-5abeafbb0fed2d2034374c38bd36651cdbf550cd.zip
cpython-5abeafbb0fed2d2034374c38bd36651cdbf550cd.tar.gz
cpython-5abeafbb0fed2d2034374c38bd36651cdbf550cd.tar.bz2
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.py1
-rw-r--r--Modules/_sre.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index 2107b3a..d2f7f6e 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -727,6 +727,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 7b3ee5f..8f3b8ce 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;
}
}