commit b50f9926ca1a6d9e55871979e494511db4bc9da4
author Amaury Forgeot d'Arc <amauryfa@gmail.com> Fri Sep 26 22:46:01 2008 +0000
committer Amaury Forgeot d'Arc <amauryfa@gmail.com> Fri Sep 26 22:46:01 2008 +0000
tree d075eb4550f9352f5704b86fb3ec425cb2f65e85
parent 4235e6f1117e6b35d183bf46487261d762486b1a

#3967: Correct a crash in count() and find() methods of string-like objects.
For example:
   "".count("xxxx", sys.maxint, 0)

Backport of r66631.

Objects/stringlib/find.h

diff --git a/Objects/stringlib/find.h b/Objects/stringlib/find.h
index 4cdbb09..ffb9e36 100644
--- a/Objects/stringlib/find.h
+++ b/Objects/stringlib/find.h
@@ -14,11 +14,10 @@
 {
     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);