Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-29 18:52:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Backport r58709 from trunk:

Browse source 
Backport fixes for the code that decodes octal escapes (and for PyString
also hex escapes) -- this was reaching beyond the end of the input string
buffer, even though it is not supposed to be \0-terminated.
This has no visible effect but is clearly the correct thing to do.
(In 3.0 it had a visible effect after removing ob_sstate from PyString.)
Also fixes #1098.
This commit is contained in:
Georg Brandl 2007-11-02 22:46:38 +00:00
parent 2c3e0d94b2
commit 1dcb9c93fd
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Objects/stringobject.c
View file

@ -616,16 +616,18 @@ PyObject *PyString_DecodeEscape(const char *s,
case '0': case '1': case '2': case '3':
case '4': case '5': case '6': case '7':
c = s[-1] - '0';
if ('0' <= *s && *s <= '7') {
if (s < end && '0' <= *s && *s <= '7') {
c = (c<<3) + *s++ - '0';
if ('0' <= *s && *s <= '7')
if (s < end && '0' <= *s && *s <= '7')
c = (c<<3) + *s++ - '0';
}
*p++ = c;
break;
case 'x':
if (isxdigit(Py_CHARMASK(s[0]))
&& isxdigit(Py_CHARMASK(s[1]))) {
if (s+1 < end &&
isxdigit(Py_CHARMASK(s[0])) &&
isxdigit(Py_CHARMASK(s[1])))
{
unsigned int x = 0;
c = Py_CHARMASK(*s);
s++;