diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-09-26 22:48:41 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-09-26 22:48:41 (GMT) |
| commit | f2e9368021d8e22e3dce5c201fea111660d75ee1 (patch) | |
| tree | de0f9eac2f420fd2d4c6ed59dd4758659aba96e7 /Objects/stringlib/count.h | |
| parent | 60320cb3e4fa0d77ae5f8634d83de497bba003f6 (diff) | |
| download | cpython-f2e9368021d8e22e3dce5c201fea111660d75ee1.zip cpython-f2e9368021d8e22e3dce5c201fea111660d75ee1.tar.gz cpython-f2e9368021d8e22e3dce5c201fea111660d75ee1.tar.bz2 | |
Merged revisions 66631 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66631 | amaury.forgeotdarc | 2008-09-27 00:34:08 +0200 (sam., 27 sept. 2008) | 7 lines
#3967: Correct a crash in count() and find() methods of string-like objects.
For example:
"".count("xxxx", sys.maxint, 0)
Reviewed by Benjamin Peterson.
Will port to 2.5 and 3.0.
........
Diffstat (limited to 'Objects/stringlib/count.h')
| -rw-r--r-- | Objects/stringlib/count.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Objects/stringlib/count.h b/Objects/stringlib/count.h index 367a15c..eba37e9 100644 --- a/Objects/stringlib/count.h +++ b/Objects/stringlib/count.h @@ -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); |