From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 4 Mar 2010 22:01:47 +0000 (+0000)
Subject: Merged revisions 78664 via svnmerge from
X-Git-Tag: v3.1.2rc1~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26c966b91d4e87b15efb3ec0a01db34f06ff895a;p=thirdparty%2FPython%2Fcpython.git

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.
........
---

diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index 1626c80b95d4..99cc47ba3a3e 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 74d942568f85..ee6a26bb4024 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;
 		}
 	}