[Python-checkins] r66632 - in python/branches/release25-maint: Lib/test/string_tests.py Misc/NEWS Objects/stringlib/count.h Objects/stringlib/find.h

Sat Sep 27 00:46:01 CEST 2008

Author: amaury.forgeotdarc
Date: Sat Sep 27 00:46:01 2008
New Revision: 66632
Log:
#3967: Correct a crash in count() and find() methods of string-like objects.
For example:
 "".count("xxxx", sys.maxint, 0)
Backport of r66631.
Modified:
 python/branches/release25-maint/Lib/test/string_tests.py
 python/branches/release25-maint/Misc/NEWS
 python/branches/release25-maint/Objects/stringlib/count.h
 python/branches/release25-maint/Objects/stringlib/find.h
Modified: python/branches/release25-maint/Lib/test/string_tests.py
==============================================================================

--- python/branches/release25-maint/Lib/test/string_tests.py	(original)
+++ python/branches/release25-maint/Lib/test/string_tests.py	Sat Sep 27 00:46:01 2008
@@ -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
Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Sat Sep 27 00:46:01 2008
@@ -12,6 +12,9 @@
 Core and builtins
 -----------------
 
+- Issue #3967: Fixed a crash in the count() and find() methods of string-like
+ objects, when the "start" parameter is a huge value.
+
 - Issue #3936: The parser warnings for using "as" and "with" as variable names
 didn't fire after import statements.
 
Modified: python/branches/release25-maint/Objects/stringlib/count.h
==============================================================================
--- python/branches/release25-maint/Objects/stringlib/count.h	(original)
+++ python/branches/release25-maint/Objects/stringlib/count.h	Sat Sep 27 00:46:01 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/release25-maint/Objects/stringlib/find.h
==============================================================================
--- python/branches/release25-maint/Objects/stringlib/find.h	(original)
+++ python/branches/release25-maint/Objects/stringlib/find.h	Sat Sep 27 00:46:01 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);
 
