Mercurial > cpython-lru_cache-weakref
diff Objects/stringlib/string_format.h @ 62171:d3797e9dfd2c
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
........
| author | Benjamin Peterson <benjamin@python.org> |
|---|---|
| date | Mon, 07 Jun 2010 22:31:26 +0000 |
| parents | cab14be0ada1 |
| children | 0991b40e895d fd044cda97d8 |
line wrap: on
line diff
--- a/Objects/stringlib/string_format.h Mon Jun 07 22:24:18 2010 +0000 +++ b/Objects/stringlib/string_format.h Mon Jun 07 22:31:26 2010 +0000 @@ -373,6 +373,8 @@ 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 @@ /* 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;