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

re PR libstdc++/8230 (Buggy allocator behaviour) 

2002-11-13  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/8230
	* include/bits/vector.tcc (vector::reserve): Throw length_error if
	requested size is bigger than max_size().
	* include/bits/stl_bvector.h (vector<bool>::reserve): Same.
	* testsuite/23_containers/vector_capacity.cc (test02): Add.

From-SVN: r59090
This commit is contained in:
Benjamin Kosnik 2002-11-13 22:15:17 +00:00
parent 1a083c0e90
commit 48d1c3c568
4 changed files with 73 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,10 +1,18 @@
2002-11-13 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/8230
* include/bits/vector.tcc (vector::reserve): Throw length_error if
requested size is bigger than max_size().
* include/bits/stl_bvector.h (vector<bool>::reserve): Same.
* testsuite/23_containers/vector_capacity.cc (test02): Add.
2002-11-13 Benjamin Kosnik <bkoz@redhat.com>
* config/linker-map.gnu: Export all _S_construct.
2002-11-13 Loren J. Rittle <ljrittle@acm.org>
libstdc++/7445
PR libstdc++/7445
* src/locale.cc (std::locale::classic()): Weaken locking protocol.
2002-11-13 Jonathan Wakely <redi@gcc.gnu.org>

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

@ -604,7 +604,9 @@ template <typename _Alloc>
}
void reserve(size_type __n) {
if (capacity() < __n) {
if (__n > this->max_size())
__throw_length_error("vector::reserve");
if (this->capacity() < __n) {
_Bit_type * __q = _M_bit_alloc(__n);
_M_finish = copy(begin(), end(), iterator(__q, 0));
_M_deallocate();

22
libstdc++-v3/include/bits/vector.tcc
View File

@ -68,16 +68,18 @@ namespace std
vector<_Tp,_Alloc>::
reserve(size_type __n)
{
if (capacity() < __n)
{
const size_type __old_size = size();
pointer __tmp = _M_allocate_and_copy(__n, _M_start, _M_finish);
_Destroy(_M_start, _M_finish);
_M_deallocate(_M_start, _M_end_of_storage - _M_start);
_M_start = __tmp;
_M_finish = __tmp + __old_size;
_M_end_of_storage = _M_start + __n;
}
if (__n > this->max_size())
__throw_length_error("vector::reserve");
if (this->capacity() < __n)
{
const size_type __old_size = size();
pointer __tmp = _M_allocate_and_copy(__n, _M_start, _M_finish);
_Destroy(_M_start, _M_finish);
_M_deallocate(_M_start, _M_end_of_storage - _M_start);
_M_start = __tmp;
_M_finish = __tmp + __old_size;
_M_end_of_storage = _M_start + __n;
}
}
template <typename _Tp, typename _Alloc>

58
libstdc++-v3/testsuite/23_containers/vector_capacity.cc
View File

@ -1,7 +1,7 @@
// 1999-05-07
// bkoz
// Copyright (C) 1999 Free Software Foundation, Inc.
// Copyright (C) 1999, 2002 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@ -22,6 +22,7 @@
// 23.2.4.2 vector capacity
#include <vector>
#include <stdexcept>
#include <testsuite_hooks.h>
template<typename T>
@ -29,9 +30,8 @@ template<typename T>
struct B { };
bool test01()
void test01()
{
// non POD types
bool test = true;
std::vector< A<B> > vec01;
@ -51,17 +51,57 @@ bool test01()
vec01.resize(sz01);
sz02 = vec01.size();
VERIFY( sz01 == sz02 );
}
#ifdef DEBUG_ASSERT
assert(test);
#endif
return test;
// libstdc++/8230
void test02()
{
bool test = true;
{
std::vector<int> array;
const std::size_t size = array.max_size();
try
{
array.reserve(size);
}
catch (const std::length_error& error)
{
test &= false;
}
catch (const std::bad_alloc& error)
{
test &= true;
}
catch (...)
{
test &= false;
}
VERIFY( test );
}
{
std::vector<int> array;
const std::size_t size = array.max_size() + 1;
try
{
array.reserve(size);
}
catch (const std::length_error& error)
{
test &= true;
}
catch (...)
{
test &= false;
}
VERIFY( test );
}
}
int main()
{
test01();
test02();
return 0;
}