diff options
| author | Guido van Rossum <guido@python.org> | 2007-10-29 22:15:05 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-10-29 22:15:05 +0000 |
| commit | 1c1ac3815716b9db9c41111e65919689b41e6d34 (patch) | |
| tree | ac779e7252c2455bddeed257fa21b85f6e9a0096 /Objects/unicodeobject.c | |
| parent | dff51b2898145d4f9c5db669db4f9ef5a67ab4b5 (diff) | |
| download | cpython-git-1c1ac3815716b9db9c41111e65919689b41e6d34.tar.gz | |
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.)
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 26aa7533ba..1f6f738c6d 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -2081,7 +2081,10 @@ PyObject *PyUnicode_DecodeUnicodeEscape(const char *s, startinpos = s-starts; /* \ - Escapes */ s++; - switch (*s++) { + c = *s++; + if (s > end) + c = '\0'; /* Invalid after \ */ + switch (c) { /* \x escapes */ case '\n': break; @@ -2100,9 +2103,9 @@ PyObject *PyUnicode_DecodeUnicodeEscape(const char *s, case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': x = s[-1] - '0'; - if ('0' <= *s && *s <= '7') { + if (s < end && '0' <= *s && *s <= '7') { x = (x<<3) + *s++ - '0'; - if ('0' <= *s && *s <= '7') + if (s < end && '0' <= *s && *s <= '7') x = (x<<3) + *s++ - '0'; } *p++ = x; |