OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

basic_string.h (replace(__pos, __n1, __s, __n2): Fix and tighten __throw_length_error check. 

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 (test04): New.
	* testsuite/21_strings/replace.cc (test02, test03): Tweak.

From-SVN: r52803
This commit is contained in:
Paolo Carlini 2002-04-26 21:36:27 +02:00 committed by Paolo Carlini
parent 6ffe9df0c4
commit e81de24ca7
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
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 (test04): New.
* testsuite/21_strings/replace.cc (test02, test03): Tweak.
2002-04-23 Loren J. Rittle <ljrittle@acm.org>
* include/std/std_fstream.h (basic_filebuf::sync): Hoist

4
libstdc++-v3/include/bits/basic_string.h
View File

@ -642,10 +642,10 @@ namespace std
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,

16
libstdc++-v3/testsuite/21_strings/replace.cc
View File

@ -84,6 +84,7 @@ bool test01(void)
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,
@ -100,6 +101,7 @@ test02()
void
test03()
{
bool test = true;
const char* title01 = "nine types of ambiguity";
const char* title02 = "ultra";
std::string str01 = title01;
@ -139,10 +141,24 @@ test03()
VERIFY(str01 == "ultra");
}
// We wrongly used __n1 instead of __foldn1 in the length_error
// check at the beginning of replace(__pos, __n1, __s, __n2)
void
test04()
{
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();
return 0;
}