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.

Lib/test/string_tests.py

diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py
index e56bc02..31da13d 100644
--- a/Lib/test/string_tests.py
+++ b/Lib/test/string_tests.py
@@ -120,6 +120,14 @@
         self.checkequal(2, 'aaa', 'count', '', -1)
         self.checkequal(4, 'aaa', 'count', '', -10)
 
+        self.checkequal(1, '', 'count', '')
+        self.checkequal(0, '', 'count', '', 1, 1)
+        self.checkequal(0, '', 'count', '', sys.maxint, 0)
+
+        self.checkequal(0, '', 'count', 'xx')
+        self.checkequal(0, '', 'count', 'xx', 1, 1)
+        self.checkequal(0, '', 'count', 'xx', sys.maxint, 0)
+
         self.checkraises(TypeError, 'hello', 'count')
         self.checkraises(TypeError, 'hello', 'count', 42)
 
@@ -162,6 +170,14 @@
         self.checkraises(TypeError, 'hello', 'find')
         self.checkraises(TypeError, 'hello', 'find', 42)
 
+        self.checkequal(0, '', 'find', '')
+        self.checkequal(-1, '', 'find', '', 1, 1)
+        self.checkequal(-1, '', 'find', '', sys.maxint, 0)
+
+        self.checkequal(-1, '', 'find', 'xx')
+        self.checkequal(-1, '', 'find', 'xx', 1, 1)
+        self.checkequal(-1, '', 'find', 'xx', sys.maxint, 0)
+
         # For a variety of combinations,
         #    verify that str.find() matches __contains__
         #    and that the found substring is really at that location