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

Marc-Andre Lemburg <mal@lemburg.com>: 

Fixed a bug in PyUnicode_Count() which would have caused a
core dump in case of substring coercion failure.

Synchronized .count() with the string method of the same name
to return len(s)+1 for s.count('').
This commit is contained in:
Marc-André Lemburg 2000-06-18 22:25:22 +00:00
parent 2f4d0e9bb6
commit 49ef6dc1f4
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Objects/unicodeobject.c
View File

@ -2106,6 +2106,9 @@ int count(PyUnicodeObject *self,
{
int count = 0;
if (substring->length == 0)
return (end - start + 1);
end -= substring->length;
while (start <= end)
@ -2130,7 +2133,7 @@ int PyUnicode_Count(PyObject *str,
return -1;
substr = PyUnicode_FromObject(substr);
if (substr == NULL) {
Py_DECREF(substr);
Py_DECREF(str);
return -1;
}
@ -3086,11 +3089,6 @@ unicode_count(PyUnicodeObject *self, PyObject *args)
if (substring == NULL)
return NULL;
if (substring->length == 0) {
Py_DECREF(substring);
return PyInt_FromLong((long) 0);
}
if (start < 0)
start += self->length;
if (start < 0)