From fc5ea3928947152d60c3a1d1c456345a64774cf0 Mon Sep 17 00:00:00 2001 From: Amaury Forgeot d'Arc Date: Fri, 26 Sep 2008 22:34:08 +0000 Subject: #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. --- Objects/stringlib/count.h | 7 +++---- Objects/stringlib/find.h | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'Objects/stringlib') diff --git a/Objects/stringlib/count.h b/Objects/stringlib/count.h index 367a15c51a..eba37e9cc8 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 9e0d299845..fbe99c75ae 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); -- cgit v1.2.1