[Python-checkins] r78665 - in python/branches/release31-maint: Lib/test/test_re.py Modules/_sre.c

Thu Mar 4 23:01:47 CET 2010

Author: victor.stinner
Date: Thu Mar 4 23:01:47 2010
New Revision: 78665
Log:
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.
........
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Lib/test/test_re.py
 python/branches/release31-maint/Modules/_sre.c
Modified: python/branches/release31-maint/Lib/test/test_re.py
==============================================================================

--- python/branches/release31-maint/Lib/test/test_re.py	(original)
+++ python/branches/release31-maint/Lib/test/test_re.py	Thu Mar 4 23:01:47 2010
@@ -706,6 +706,7 @@
 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
Modified: python/branches/release31-maint/Modules/_sre.c
==============================================================================
--- python/branches/release31-maint/Modules/_sre.c	(original)
+++ python/branches/release31-maint/Modules/_sre.c	Thu Mar 4 23:01:47 2010
@@ -2702,7 +2702,7 @@
 	else {
 		Py_ssize_t p_length;
 		if (!getstring(pattern, &p_length, &self->charsize)) {
-			PyObject_DEL(self);
+			Py_DECREF(self);
 			return NULL;
 		}
 	}
