commit fc5ea3928947152d60c3a1d1c456345a64774cf0
author Amaury Forgeot d'Arc <amauryfa@gmail.com> Fri Sep 26 22:34:08 2008 +0000
committer Amaury Forgeot d'Arc <amauryfa@gmail.com> Fri Sep 26 22:34:08 2008 +0000
tree 53e7293433b59bdac7f4150cfaafd2efdcdbc98e
parent da84d21a0c5fdd1da0fbc2d3638e3ee34731dd2c

#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

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 @@
 {
     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);