Merged revisions 78664 via svnmerge from

Victor Stinner · Victor Stinner · commit 26c966b91d4e · 2010-03-04T22:01:47.000Z
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
@@ -706,6 +706,7 @@ def test_dealloc(self):
         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
@@ -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;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -2702,7 +2702,7 @@ _compile(PyObject* self_, PyObject* args)`
`2702`	`2702`	`else {`
`2703`	`2703`	`Py_ssize_t p_length;`
`2704`	`2704`	`if (!getstring(pattern, &p_length, &self->charsize)) {`
`2705`		`- PyObject_DEL(self);`
	`2705`	`+ Py_DECREF(self);`
`2706`	`2706`	`return NULL;`
`2707`	`2707`	`}`
`2708`	`2708`	`}`