diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-06-08 15:12:17 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-06-08 15:12:17 (GMT) |
| commit | 99bcf5ce08d3f326e2a869bff2556ed363256737 (patch) | |
| tree | d4bb921825c6140c7c3de5fac42eb5b74957d55e /Objects | |
| parent | 737e469da3ed04a67fa37bbc052b3e44980e4167 (diff) | |
| download | cpython-99bcf5ce08d3f326e2a869bff2556ed363256737.zip cpython-99bcf5ce08d3f326e2a869bff2556ed363256737.tar.gz cpython-99bcf5ce08d3f326e2a869bff2556ed363256737.tar.bz2 | |
Merged revisions 81823,81835 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r81823 | benjamin.peterson | 2010-06-07 17:31:26 -0500 (Mon, 07 Jun 2010) | 9 lines
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
........
................
r81835 | benjamin.peterson | 2010-06-08 09:57:22 -0500 (Tue, 08 Jun 2010) | 9 lines
Merged revisions 81834 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81834 | benjamin.peterson | 2010-06-08 09:53:29 -0500 (Tue, 08 Jun 2010) | 1 line
kill extra word
........
................
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; |