* include/bits/basic_string.h (replace(__pos, __n1, __s, __n2):
Fix and tighten __throw_length_error check.
* testsuite/21_strings/replace.cc (test05): New.
* testsuite/21_strings/replace.cc (test02, test03, test04): Tweak.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@52797
138bc75d-0d04-0410-961f-
82ee72b054a4
+2002-04-26 Paolo Carlini <pcarlini@unitus.it>
+
+ * include/bits/basic_string.h (replace(__pos, __n1, __s, __n2):
+ Fix and tighten __throw_length_error check.
+ * testsuite/21_strings/replace.cc (test05): New.
+ * testsuite/21_strings/replace.cc (test02, test03, test04): Tweak.
+
2002-04-23 Loren J. Rittle <ljrittle@acm.org>
* include/std/std_fstream.h (basic_filebuf::sync): Hoist
const size_type __size = this->size();
if (__pos > __size)
__throw_out_of_range("basic_string::replace");
- if (__size - __n1 > this->max_size() - __n2)
- __throw_length_error("basic_string::replace");
const bool __testn1 = __n1 < __size - __pos;
const size_type __foldn1 = __testn1 ? __n1 : __size - __pos;
+ if (__size - __foldn1 > this->max_size() - __n2)
+ __throw_length_error("basic_string::replace");
if (_M_rep()->_M_is_shared() || less<const _CharT*>()(__s, _M_data())
|| less<const _CharT*>()(_M_data() + __size, __s))
return _M_replace_safe(_M_ibegin() + __pos,
void
test02()
{
+ bool test = true;
const char* strlit = "../the long pier/Hanalei Bay/Kauai/Hawaii";
std::string aux = strlit;
aux.replace(aux.begin()+5, aux.begin()+20,
void
test03()
{
+ bool test = true;
const char* title01 = "nine types of ambiguity";
const char* title02 = "ultra";
std::string str01 = title01;
void
test04()
{
+ bool test = true;
std::string str01 = "geogaddi";
std::string str02;
VERIFY(str02 == "geogaddi");
}
+// We wrongly used __n1 instead of __foldn1 in the length_error
+// check at the beginning of replace(__pos, __n1, __s, __n2)
+void
+test05()
+{
+ bool test = true;
+ std::string str01 = "londinium";
+ std::string str02 = "cydonia";
+
+ str01.replace(0, 20, str02.c_str(), 3);
+ VERIFY(str01 == "cyd");
+}
+
int main()
{
test01();
test02();
test03();
test04();
+ test05();
return 0;
}