From f2e9368021d8e22e3dce5c201fea111660d75ee1 Mon Sep 17 00:00:00 2001 From: Amaury Forgeot d'Arc Date: Fri, 26 Sep 2008 22:48:41 +0000 Subject: 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. ........ --- Objects/stringlib/count.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Objects/stringlib/count.h') diff --git a/Objects/stringlib/count.h b/Objects/stringlib/count.h index 367a15c51a5..eba37e9cc80 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); -- cgit v1.2.3