basic_string.tcc (find(const _CharT*, size_type, size_type)): Robustify.

2006-09-05  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/basic_string.tcc (find(const _CharT*, size_type,
	size_type)): Robustify.
	* include/ext/vstring.tcc (find(const _CharT*, size_type,
	size_type)): Likewise.

From-SVN: r116700

libstdc++-v3/ChangeLog

 2006-09-05  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/bits/basic_string.tcc (find(const _CharT*, size_type,
+	size_type)): Robustify.
+	* include/ext/vstring.tcc (find(const _CharT*, size_type,
+	size_type)): Likewise.
+
+2006-09-05  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/bits/basic_string.tcc (find(const _CharT*, size_type,
 	size_type)): Reimplement in terms of traits::eq and traits::compare.
 	* include/ext/vstring.tcc (find(const _CharT*, size_type,
 	size_type)): Likewise.

libstdc++-v3/include/bits/basic_string.tcc

@@ -716,10 +716,14 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       if (__n == 0)
 	return __pos <= __size ? __pos : npos;
 
-      for (; __pos + __n <= __size; ++__pos)
-	if (traits_type::eq(__data[__pos], __s[0])
-	    && traits_type::compare(__data + __pos + 1, __s + 1, __n - 1) == 0)
-	  return __pos;
+      if (__n <= __size)
+	{
+	  for (; __pos + __n <= __size; ++__pos)
+	    if (traits_type::eq(__data[__pos], __s[0])
+		&& traits_type::compare(__data + __pos + 1,
+					__s + 1, __n - 1) == 0)
+	      return __pos;
+	}
       return npos;
     }
 

libstdc++-v3/include/ext/vstring.tcc

@@ -277,10 +277,14 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       if (__n == 0)
 	return __pos <= __size ? __pos : npos;
 
-      for (; __pos + __n <= __size; ++__pos)
-	if (traits_type::eq(__data[__pos], __s[0])
-	    && traits_type::compare(__data + __pos + 1, __s + 1, __n - 1) == 0)
-	  return __pos;
+      if (__n <= __size)
+	{
+	  for (; __pos + __n <= __size; ++__pos)
+	    if (traits_type::eq(__data[__pos], __s[0])
+		&& traits_type::compare(__data + __pos + 1,
+					__s + 1, __n - 1) == 0)
+	      return __pos;
+	}
       return npos;
     }