mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

In release mode, PyUnicode_InternInPlace() does nothing if the input is NULL or

Browse source 
not a unicode, instead of failing with a fatal error.

Use assertions in debug mode (provide better error messages).
This commit is contained in:
Victor Stinner 2011-10-03 02:01:52 +02:00
parent 23e5668214
commit 4fae54cb0e
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Objects/unicodeobject.c
View file

@ -12893,9 +12893,13 @@ PyUnicode_InternInPlace(PyObject **p)
{ {
register PyUnicodeObject *s = (PyUnicodeObject *)(*p); register PyUnicodeObject *s = (PyUnicodeObject *)(*p);
PyObject *t; PyObject *t;
#ifdef Py_DEBUG
assert(s != NULL);
assert(_PyUnicode_CHECK(s));
#else
if (s == NULL || !PyUnicode_Check(s)) if (s == NULL || !PyUnicode_Check(s))
Py_FatalError( return;
"PyUnicode_InternInPlace: unicode strings only please!"); #endif
/* If it's a subclass, we don't really know what putting /* If it's a subclass, we don't really know what putting
it in the interned dict might do. */ it in the interned dict might do. */
if (!PyUnicode_CheckExact(s)) if (!PyUnicode_CheckExact(s))
@ -12903,7 +12907,7 @@ PyUnicode_InternInPlace(PyObject **p)
if (PyUnicode_CHECK_INTERNED(s)) if (PyUnicode_CHECK_INTERNED(s))
return; return;
if (PyUnicode_READY(s) == -1) { if (PyUnicode_READY(s) == -1) {
assert(0 && "ready fail in intern..."); assert(0 && "PyUnicode_READY fail in PyUnicode_InternInPlace");
return; return;
} }
if (interned == NULL) { if (interned == NULL) {