Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-29 18:52:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

#3967: Correct a crash in count() and find() methods of string-like objects.

Browse source 
For example:
   "".count("xxxx", sys.maxint, 0)

Backport of r66631.
This commit is contained in:
Amaury Forgeot d'Arc 2008-09-26 22:46:01 +00:00
parent 4235e6f111
commit b50f9926ca
4 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Objects/stringlib/count.h
View file

@ -13,11 +13,10 @@ stringlib_count(const STRINGLIB_CHAR* str, Py_ssize_t str_len,
{
Py_ssize_t count;
if (sub_len == 0) {
if (str_len < 0)
return 0; /* start > len(str) */
if (str_len < 0)
return 0; /* start > len(str) */
if (sub_len == 0)
return str_len + 1;
}
count = fastsearch(str, str_len, sub, sub_len, FAST_COUNT);

7
Objects/stringlib/find.h
View file

@ -14,11 +14,10 @@ stringlib_find(const STRINGLIB_CHAR* str, Py_ssize_t str_len,
{
Py_ssize_t pos;
if (sub_len == 0) {
if (str_len < 0)
return -1;
if (str_len < 0)
return -1;
if (sub_len == 0)
return offset;
}
pos = fastsearch(str, str_len, sub, sub_len, FAST_SEARCH);