#3967: Correct a crash in count() and find() methods of string-like objects.

For example:
   "".count("xxxx", sys.maxint, 0)

Backport of r66631.
This commit is contained in:
Amaury Forgeot d'Arc 2008-09-26 22:46:01 +00:00
parent 4235e6f111
commit b50f9926ca
4 changed files with 25 additions and 8 deletions

View file

@ -120,6 +120,14 @@ class CommonTest(unittest.TestCase):
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 @@ class CommonTest(unittest.TestCase):
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