mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merged revisions 81820 via svnmerge from

Browse source 
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
........
This commit is contained in:
Benjamin Peterson 2010-06-07 22:31:26 +00:00
parent 5b92772e24
commit 59a1b2f732
3 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Objects/stringlib/string_format.h
View file

@ -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;