summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorFredrik Lundh <fredrik@pythonware.com>2006-05-29 22:42:07 (GMT)
committerFredrik Lundh <fredrik@pythonware.com>2006-05-29 22:42:07 (GMT)
commitb51b470eb86ded7d3ea26081ca8bc89b4448f962 (patch)
treedf73580e83c7e9079cccadc25bd5b1cd3fbd5c9d /Objects
parenta355c14fa10e3f533e4749d3cbed273b864d6235 (diff)
downloadcpython-b51b470eb86ded7d3ea26081ca8bc89b4448f962.zip
cpython-b51b470eb86ded7d3ea26081ca8bc89b4448f962.tar.gz
cpython-b51b470eb86ded7d3ea26081ca8bc89b4448f962.tar.bz2
fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on
the current behaviour ;-)
Diffstat (limited to 'Objects')
-rw-r--r--Objects/stringlib/count.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/Objects/stringlib/count.h b/Objects/stringlib/count.h
index 0bd02b5..84a852f 100644
--- a/Objects/stringlib/count.h
+++ b/Objects/stringlib/count.h
@@ -13,8 +13,11 @@ stringlib_count(const STRINGLIB_CHAR* str, Py_ssize_t str_len,
{
Py_ssize_t count;
- if (sub_len == 0)
+ if (sub_len == 0) {
+ if (str_len < 0)
+ return 1; /* start >= len(str) */
return str_len + 1;
+ }
count = fastsearch(str, str_len, sub, sub_len, FAST_COUNT);