diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-06-07 22:23:23 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-06-07 22:23:23 (GMT) |
| commit | 13e934acc0b96a41d101674959b19df2a7a718b4 (patch) | |
| tree | 54a5d9fbeb9985a2821e63c0367504d7f6338697 /Objects/stringlib | |
| parent | 0b41707dde35b1357427a8109fba10f9e92139b6 (diff) | |
| download | cpython-13e934acc0b96a41d101674959b19df2a7a718b4.zip cpython-13e934acc0b96a41d101674959b19df2a7a718b4.tar.gz cpython-13e934acc0b96a41d101674959b19df2a7a718b4.tar.bz2 | |
correctly overflow when indexes are too large
Diffstat (limited to 'Objects/stringlib')
| -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 0aafb14..e7bf724 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; |