mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-13 18:33:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 77395 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r77395 | benjamin.peterson | 2010-01-09 15:45:28 -0600 (Sat, 09 Jan 2010) | 2 lines

  Python strings ending with '\0' should not be equivalent to their C counterparts in PyUnicode_CompareWithASCIIString
........
This commit is contained in:
Benjamin Peterson 2010-01-09 21:54:39 +00:00
parent ffeda29115
commit bb81c8ce3f
3 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Objects/unicodeobject.c
View file

@ -6932,6 +6932,11 @@ PyUnicode_CompareWithASCIIString(PyObject* uni, const char* str)
for (i = 0; id[i] && str[i]; i++)
if (id[i] != str[i])
return ((int)id[i] < (int)str[i]) ? -1 : 1;
/* This check keeps Python strings that end in '\0' from comparing equal
to C strings identical up to that point. */
if (PyUnicode_GET_SIZE(uni) != i)
/* We'll say the Python string is longer. */
return 1;
if (id[i])
return 1; /* uni is longer */
if (str[i])