traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.)
This commit is contained in:
Guido van Rossum 2007-10-29 22:15:05 +00:00
parent dff51b2898
commit 1c1ac38157
2 changed files with 12 additions and 7 deletions
Show Stats 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 '0': case '1': case '2': case '3':
case '4': case '5': case '6': case '7': case '4': case '5': case '6': case '7':
c = s[-1] - '0'; c = s[-1] - '0';
if ('0' <= *s && *s <= '7') { if (s < end && '0' <= *s && *s <= '7') {
c = (c<<3) + *s++ - '0'; c = (c<<3) + *s++ - '0';
if ('0' <= *s && *s <= '7') if (s < end && '0' <= *s && *s <= '7')
c = (c<<3) + *s++ - '0'; c = (c<<3) + *s++ - '0';
} }
*p++ = c; *p++ = c;
break; break;
case 'x': case 'x':
if (isxdigit(Py_CHARMASK(s[0])) if (s+1 < end &&
&& isxdigit(Py_CHARMASK(s[1]))) { isxdigit(Py_CHARMASK(s[0])) &&
isxdigit(Py_CHARMASK(s[1])))
{
unsigned int x = 0; unsigned int x = 0;
c = Py_CHARMASK(*s); c = Py_CHARMASK(*s);
s++; s++;

9
Objects/unicodeobject.c
View File

@ -2081,7 +2081,10 @@ PyObject *PyUnicode_DecodeUnicodeEscape(const char *s,
startinpos = s-starts; startinpos = s-starts;
/* \ - Escapes */ /* \ - Escapes */
s++; s++;
switch (*s++) { c = *s++;
if (s > end)
c = '\0'; /* Invalid after \ */
switch (c) {
/* \x escapes */ /* \x escapes */
case '\n': break; case '\n': break;
@ -2100,9 +2103,9 @@ PyObject *PyUnicode_DecodeUnicodeEscape(const char *s,
case '0': case '1': case '2': case '3': case '0': case '1': case '2': case '3':
case '4': case '5': case '6': case '7': case '4': case '5': case '6': case '7':
x = s[-1] - '0'; x = s[-1] - '0';
if ('0' <= *s && *s <= '7') { if (s < end && '0' <= *s && *s <= '7') {
x = (x<<3) + *s++ - '0'; x = (x<<3) + *s++ - '0';
if ('0' <= *s && *s <= '7') if (s < end && '0' <= *s && *s <= '7')
x = (x<<3) + *s++ - '0'; x = (x<<3) + *s++ - '0';
} }
*p++ = x; *p++ = x;