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

Fix for bug #626172: crash using unicode latin1 single char 

Python 2.2.3 candidate.
This commit is contained in:
Marc-André Lemburg 2002-10-23 09:02:46 +00:00
parent 45186c4ce0
commit 9cd87aaa54
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_unicode.py
View File

@ -434,6 +434,12 @@ vereq((u'ab' in 'abc'), True)
vereq((u'ab' in (1,None,u'ab')), True)
vereq((u'' in u'abc'), True)
vereq(('' in u'abc'), True)
try:
u'\xe2' in 'g\xe2teau'
except UnicodeError:
pass
else:
print '*** contains operator does not propagate UnicodeErrors'
print 'done.'
# Formatting:

4
Objects/unicodeobject.c
View File

@ -4485,10 +4485,8 @@ int PyUnicode_Contains(PyObject *container,
goto onError;
}
u = (PyUnicodeObject *)PyUnicode_FromObject(container);
if (u == NULL) {
Py_DECREF(v);
if (u == NULL)
goto onError;
}
size = PyUnicode_GET_SIZE(v);
rhs = PyUnicode_AS_UNICODE(v);