Mercurial > cpython-lru_cache-weakref

diff Objects/stringobject.c @ 43710:124cbf1a0e3e legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.)
author Guido van Rossum <guido@python.org>
date Mon, 29 Oct 2007 22:15:05 +0000
parents 7630248b593c
children 7347f75b9c34
line wrap: on
line diff
--- a/Objects/stringobject.c	Mon Oct 29 20:52:45 2007 +0000
+++ b/Objects/stringobject.c	Mon Oct 29 22:15:05 2007 +0000
@@ -616,16 +616,18 @@
 		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++;