diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-06-07 22:31:26 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-06-07 22:31:26 (GMT) |
| commit | 59a1b2f732e9c672ec03deb965bd682706d1ef24 (patch) | |
| tree | 9cbe639f518af04965db43b22dabf8d18c88883f /Objects | |
| parent | 5b92772e242f3302f11b1d6e3d451370b98e01d5 (diff) | |
| download | cpython-59a1b2f732e9c672ec03deb965bd682706d1ef24.zip cpython-59a1b2f732e9c672ec03deb965bd682706d1ef24.tar.gz cpython-59a1b2f732e9c672ec03deb965bd682706d1ef24.tar.bz2 | |
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
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/stringlib/string_format.h | 4 |
1 files changed, 4 insertions, 0 deletions
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; |