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 1626c80b95d40bac06a2bd48caf4a416cda2ffc9..99cc47ba3a3e3766eb1a168790699198204dd2a9 100644 (file)
--- 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 74d942568f857a3c3b18a12b4accffe462120377..ee6a26bb4024b1dfb7474ce343fc017d4665fa1d 100644 (file)
--- 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;
                }
        }