[Python-checkins] r73403 - in python/branches/release30-maint: Lib/test/test_range.py Misc/NEWS Objects/rangeobject.c

Sat Jun 13 03:16:02 CEST 2009

Author: raymond.hettinger
Date: Sat Jun 13 03:16:02 2009
New Revision: 73403
Log:
Backport 73392: Fix SystemError and ref counting issues.
Modified:
 python/branches/release30-maint/Lib/test/test_range.py
 python/branches/release30-maint/Misc/NEWS
 python/branches/release30-maint/Objects/rangeobject.c
Modified: python/branches/release30-maint/Lib/test/test_range.py
==============================================================================

--- python/branches/release30-maint/Lib/test/test_range.py	(original)
+++ python/branches/release30-maint/Lib/test/test_range.py	Sat Jun 13 03:16:02 2009
@@ -71,6 +71,12 @@
 self.assertEquals(list(pickle.loads(pickle.dumps(r, proto))),
 list(r))
 
+ def test_odd_bug(self):
+ # This used to raise a "SystemError: NULL result without error"
+ # because the range validation step was eating the exception
+ # before NULL was returned.
+ self.assertRaises(TypeError, range, [], 1, -1)
+
 def test_main():
 test.support.run_unittest(RangeTest)
 
Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Sat Jun 13 03:16:02 2009
@@ -12,6 +12,8 @@
 Core and Builtins
 -----------------
 
+- Fixed SystemError triggered by "range([], 1, -1)".
+
 - Issue #5924: On Windows, a large PYTHONPATH environment variable
 (more than 255 characters) would be completely ignored.
 
Modified: python/branches/release30-maint/Objects/rangeobject.c
==============================================================================
--- python/branches/release30-maint/Objects/rangeobject.c	(original)
+++ python/branches/release30-maint/Objects/rangeobject.c	Sat Jun 13 03:16:02 2009
@@ -59,26 +59,42 @@
 
 if (PyTuple_Size(args) <= 1) {
 if (!PyArg_UnpackTuple(args, "range", 1, 1, &stop))
- goto Fail;
+ return NULL;
 stop = PyNumber_Index(stop);
 if (!stop)
- goto Fail;
+ return NULL;
 start = PyLong_FromLong(0);
+ if (!start) {
+ Py_DECREF(stop);
+ return NULL;
+ }
 step = PyLong_FromLong(1);
- if (!start || !step)
- goto Fail;
+ if (!step) {
+ Py_DECREF(stop);
+ Py_DECREF(start);
+ return NULL;
+ }
 }
 else {
 if (!PyArg_UnpackTuple(args, "range", 2, 3,
 &start, &stop, &step))
- goto Fail;
+ return NULL;
 
 /* Convert borrowed refs to owned refs */
 start = PyNumber_Index(start);
+ if (!start)
+ return NULL;
 stop = PyNumber_Index(stop);
- step = validate_step(step);
- if (!start || !stop || !step)
- goto Fail;
+ if (!stop) {
+ Py_DECREF(start);
+ return NULL;
+ }
+ step = validate_step(step); /* Caution, this can clear exceptions */
+ if (!step) {
+ Py_DECREF(start);
+ Py_DECREF(stop);
+ return NULL;
+ }
 }
 
 obj = PyObject_New(rangeobject, &PyRange_Type);
