diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-09-26 22:34:08 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-09-26 22:34:08 (GMT) |
| commit | fc5ea3928947152d60c3a1d1c456345a64774cf0 (patch) | |
| tree | 53e7293433b59bdac7f4150cfaafd2efdcdbc98e /Objects | |
| parent | da84d21a0c5fdd1da0fbc2d3638e3ee34731dd2c (diff) | |
| download | cpython-fc5ea3928947152d60c3a1d1c456345a64774cf0.zip cpython-fc5ea3928947152d60c3a1d1c456345a64774cf0.tar.gz cpython-fc5ea3928947152d60c3a1d1c456345a64774cf0.tar.bz2 | |
#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')
| -rw-r--r-- | Objects/stringlib/count.h | 7 | ||||
| -rw-r--r-- | Objects/stringlib/find.h | 7 |
2 files changed, 6 insertions, 8 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); diff --git a/Objects/stringlib/find.h b/Objects/stringlib/find.h index 9e0d299..fbe99c7 100644 --- a/Objects/stringlib/find.h +++ b/Objects/stringlib/find.h @@ -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); |