[Python-checkins] cpython (3.5): Issue #28350: String constants with null character no longer interned.

Tue Oct 4 11:25:18 EDT 2016

https://hg.python.org/cpython/rev/d7ab3241aef2
changeset: 104276:d7ab3241aef2
branch: 3.5
parent: 104260:b24d0f274623
user: Serhiy Storchaka <storchaka at gmail.com>
date: Tue Oct 04 18:17:22 2016 +0300
summary:
 Issue #28350: String constants with null character no longer interned.
files:
 Lib/test/test_code.py | 20 +++++++++++++++++---
 Misc/NEWS | 2 ++
 Objects/codeobject.c | 16 ++++++++--------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -135,19 +135,27 @@
 self.assertEqual(co.co_name, "funcname")
 self.assertEqual(co.co_firstlineno, 15)
 
+
+def isinterned(s):
+ return s is sys.intern(('_' + s + '_')[1:-1])
+
 class CodeConstsTest(unittest.TestCase):
 
 def find_const(self, consts, value):
 for v in consts:
 if v == value:
 return v
- self.assertIn(value, consts) # rises an exception
- self.fail('Should be never reached')
+ self.assertIn(value, consts) # raises an exception
+ self.fail('Should never be reached')
 
 def assertIsInterned(self, s):
- if s is not sys.intern(s):
+ if not isinterned(s):
 self.fail('String %r is not interned' % (s,))
 
+ def assertIsNotInterned(self, s):
+ if isinterned(s):
+ self.fail('String %r is interned' % (s,))
+
 @cpython_only
 def test_interned_string(self):
 co = compile('res = "str_value"', '?', 'exec')
@@ -172,6 +180,12 @@
 return a
 self.assertIsInterned(f())
 
+ @cpython_only
+ def test_interned_string_with_null(self):
+ co = compile(r'res = "str0円value!"', '?', 'exec')
+ v = self.find_const(co.co_consts, 'str0円value!')
+ self.assertIsNotInterned(v)
+
 
 class CodeWeakRefTest(unittest.TestCase):
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #28350: String constants with null character no longer interned.
+
 - Issue #27942: String constants now interned recursively in tuples and frozensets.
 
 - Issue #21578: Fixed misleading error message when ImportError called with
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -11,21 +11,21 @@
 all_name_chars(PyObject *o)
 {
 static char ok_name_char[256];
- static unsigned char *name_chars = (unsigned char *)NAME_CHARS;
- PyUnicodeObject *u = (PyUnicodeObject *)o;
- const unsigned char *s;
+ static const unsigned char *name_chars = (unsigned char *)NAME_CHARS;
+ const unsigned char *s, *e;
 
- if (!PyUnicode_Check(o) || PyUnicode_READY(u) == -1 ||
- PyUnicode_MAX_CHAR_VALUE(u) >= 128)
+ if (!PyUnicode_Check(o) || PyUnicode_READY(o) == -1 ||
+ !PyUnicode_IS_ASCII(o))
 return 0;
 
 if (ok_name_char[*name_chars] == 0) {
- unsigned char *p;
+ const unsigned char *p;
 for (p = name_chars; *p; p++)
 ok_name_char[*p] = 1;
 }
- s = PyUnicode_1BYTE_DATA(u);
- while (*s) {
+ s = PyUnicode_1BYTE_DATA(o);
+ e = s + PyUnicode_GET_LENGTH(o);
+ while (s != e) {
 if (ok_name_char[*s++] == 0)
 return 0;
 }
-- 
Repository URL: https://hg.python.org/cpython
