From 59a1b2f732e9c672ec03deb965bd682706d1ef24 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 7 Jun 2010 22:31:26 +0000 Subject: Merged revisions 81820 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81820 | benjamin.peterson | 2010-06-07 17:23:23 -0500 (Mon, 07 Jun 2010) | 1 line correctly overflow when indexes are too large ........ --- Lib/test/test_unicode.py | 3 +++ Misc/NEWS | 3 +++ Objects/stringlib/string_format.h | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 4ac0712..10714c8 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -681,6 +681,9 @@ class UnicodeTest(string_tests.CommonTest, self.assertRaises(IndexError, "{:}".format) self.assertRaises(IndexError, "{:s}".format) self.assertRaises(IndexError, "{}".format) + big = "23098475029384702983476098230754973209482573" + self.assertRaises(ValueError, ("{" + big + "}").format) + self.assertRaises(ValueError, ("{[" + big + "]}").format, [0]) # issue 6089 self.assertRaises(ValueError, "{0[0]x}".format, [None]) diff --git a/Misc/NEWS b/Misc/NEWS index d83af83..fc3dd77 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,6 +15,9 @@ Core and Builtins - Issue #8837: Remove "O?" format of PyArg_Parse*() functions. The format is no used anymore and it was never documented. +- In the str.format(), raise a ValueError when either indexes to arguments are + too large. + - Issue #2844: Make int('42', n) consistently raise ValueError for invalid integers n (including n = -909). diff --git a/Objects/stringlib/string_format.h b/Objects/stringlib/string_format.h index ecb00a9..bc70e97 100644 --- a/Objects/stringlib/string_format.h +++ b/Objects/stringlib/string_format.h @@ -373,6 +373,8 @@ FieldNameIterator_next(FieldNameIterator *self, int *is_attribute, if (_FieldNameIterator_item(self, name) == 0) return 0; *name_idx = get_integer(name); + if (*name_idx == -1 && PyErr_Occurred()) + return 0; break; default: /* Invalid character follows ']' */ @@ -429,6 +431,8 @@ field_name_split(STRINGLIB_CHAR *ptr, Py_ssize_t len, SubString *first, /* see if "first" is an integer, in which case it's used as an index */ *first_idx = get_integer(first); + if (*first_idx == -1 && PyErr_Occurred()) + return 0; field_name_is_empty = first->ptr >= first->end; -- cgit v0.12