[Python-3000-checkins] r66633 - in python/branches/py3k: Lib/test/string_tests.py Objects/stringlib/count.h Objects/stringlib/find.h

[amaury.forgeotdarc]

Author: amaury.forgeotdarc
Date: Sat Sep 27 00:48:41 2008
New Revision: 66633

Log:
Merged revisions 66631 via svnmerge from
svn+ssh://pythondev at 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.
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/test/string_tests.py
python/branches/py3k/Objects/stringlib/count.h
python/branches/py3k/Objects/stringlib/find.h

Modified: python/branches/py3k/Lib/test/string_tests.py
==============================================================================
--- python/branches/py3k/Lib/test/string_tests.py (original)
+++ python/branches/py3k/Lib/test/string_tests.py Sat Sep 27 00:48:41 2008
@@ -107,6 +107,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.maxsize, 0)
+
+ self.checkequal(0, '', 'count', 'xx')
+ self.checkequal(0, '', 'count', 'xx', 1, 1)
+ self.checkequal(0, '', 'count', 'xx', sys.maxsize, 0)
+
self.checkraises(TypeError, 'hello', 'count')
self.checkraises(TypeError, 'hello', 'count', 42)

@@ -156,6 +164,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.maxsize, 0)
+
+ self.checkequal(-1, '', 'find', 'xx')
+ self.checkequal(-1, '', 'find', 'xx', 1, 1)
+ self.checkequal(-1, '', 'find', 'xx', sys.maxsize, 0)
+
# For a variety of combinations,
# verify that str.find() matches __contains__
# and that the found substring is really at that location

Modified: python/branches/py3k/Objects/stringlib/count.h
==============================================================================
--- python/branches/py3k/Objects/stringlib/count.h (original)
+++ python/branches/py3k/Objects/stringlib/count.h Sat Sep 27 00:48:41 2008
@@ -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);


Modified: python/branches/py3k/Objects/stringlib/find.h
==============================================================================
--- python/branches/py3k/Objects/stringlib/find.h (original)
+++ python/branches/py3k/Objects/stringlib/find.h Sat Sep 27 00:48:41 2008
@@ -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);