Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

if the kind of the string to count is larger than the string to search, shortcut to 0

This commit is contained in:
Benjamin Peterson 2012-05-03 18:31:07 -04:00
parent a7b654be30
commit b63f49f2b4
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Objects/unicodeobject.c
View File

@ -11187,20 +11187,15 @@ unicode_count(PyObject *self, PyObject *args)
kind1 = PyUnicode_KIND(self);
kind2 = PyUnicode_KIND(substring);
kind = kind1 > kind2 ? kind1 : kind2;
if (kind2 > kind1)
return PyLong_FromLong(0);
kind = kind1;
buf1 = PyUnicode_DATA(self);
buf2 = PyUnicode_DATA(substring);
if (kind1 != kind)
buf1 = _PyUnicode_AsKind(self, kind);
if (!buf1) {
Py_DECREF(substring);
return NULL;
}
if (kind2 != kind)
buf2 = _PyUnicode_AsKind(substring, kind);
if (!buf2) {
Py_DECREF(substring);
if (kind1 != kind) PyMem_Free(buf1);
return NULL;
}
len1 = PyUnicode_GET_LENGTH(self);
@ -11232,8 +11227,6 @@ unicode_count(PyObject *self, PyObject *args)
result = PyLong_FromSsize_t(iresult);
if (kind1 != kind)
PyMem_Free(buf1);
if (kind2 != kind)
PyMem_Free(buf2);