procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libstdc++/59829 (Calling vector::data() occurs undefined behavior when the vector is empty)

Browse source 
PR libstdc++/59829
	* include/bits/stl_vector.h (vector::data()): Call _M_data_ptr.
	(vector::_M_data_ptr): New overloaded functions to ensure empty
	vectors do not dereference the pointer.
	* testsuite/23_containers/vector/59829.cc: New.
	* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
	Adjust dg-error line number.
	* testsuite/23_containers/vector/requirements/dr438/
	constructor_1_neg.cc: Likewise.
	* testsuite/23_containers/vector/requirements/dr438/
	constructor_2_neg.cc: Likewise.
	* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
	Likewise.

From-SVN: r207241
This commit is contained in:
Jonathan Wakely 2014-01-29 14:57:42 +00:00 • committed by Jonathan Wakely
parent 200674232e
commit 8a972abdd9
7 changed files with 104 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libstdc++-v3/ChangeLog
View file

@ -24,6 +24,20 @@
New.
* testsuite/20_util/allocator_traits/requirements/typedefs2.cc: New.
PR libstdc++/59829
* include/bits/stl_vector.h (vector::data()): Call _M_data_ptr.
(vector::_M_data_ptr): New overloaded functions to ensure empty
vectors do not dereference the pointer.
* testsuite/23_containers/vector/59829.cc: New.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
2014-01-28 Jonathan Wakely <jwakely@redhat.com>
Kyle Lippincott <spectral@google.com>

21
libstdc++-v3/include/bits/stl_vector.h
View file

@ -888,7 +888,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
pointer
#endif
data() _GLIBCXX_NOEXCEPT
{ return std::__addressof(front()); }
{ return _M_data_ptr(this->_M_impl._M_start); }
#if __cplusplus >= 201103L
const _Tp*
@ -896,7 +896,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
const_pointer
#endif
data() const _GLIBCXX_NOEXCEPT
{ return std::__addressof(front()); }
{ return _M_data_ptr(this->_M_impl._M_start); }
// [23.2.4.3] modifiers
/**
@ -1470,6 +1470,23 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
}
}
#endif
#if __cplusplus >= 201103L
template<typename _Up>
_Up*
_M_data_ptr(_Up* __ptr) const
{ return __ptr; }
template<typename _Ptr>
typename std::pointer_traits<_Ptr>::element_type*
_M_data_ptr(_Ptr __ptr) const
{ return empty() ? nullptr : std::__addressof(*__ptr); }
#else
template<typename _Ptr>
_Ptr
_M_data_ptr(_Ptr __ptr) const
{ return __ptr; }
#endif
};

67
libstdc++-v3/testsuite/23_containers/vector/59829.cc Normal file
View file

@ -0,0 +1,67 @@
// Copyright (C) 2014 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
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++11" }
// libstdc++/59829
#include <vector>
#include <testsuite_allocator.h>
// User-defined pointer type that throws if a null pointer is dereferenced.
template<typename T>
struct Pointer : __gnu_test::PointerBase<Pointer<T>, T>
{
using __gnu_test::PointerBase<Pointer<T>, T>::PointerBase;
T& operator*() const
{
if (!this->value)
throw "Dereferenced invalid pointer";
return *this->value;
}
};
// Minimal allocator using Pointer<T>
template<typename T>
struct Alloc
{
typedef T value_type;
typedef Pointer<T> pointer;
Alloc() = default;
template<typename U>
Alloc(const Alloc<U>&) { }
pointer allocate(std::size_t n)
{ return pointer(std::allocator<T>().allocate(n)); }
void deallocate(pointer p, std::size_t n)
{ std::allocator<T>().deallocate(p.value, n); }
};
template<typename T>
bool operator==(Alloc<T> l, Alloc<T> r) { return true; }
template<typename T>
bool operator!=(Alloc<T> l, Alloc<T> r) { return false; }
int main()
{
std::vector<int, Alloc<int>> a;
a.data();
}

2
libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
View file

@ -18,7 +18,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1316 }
// { dg-error "no matching" "" { target *-*-* } 1320 }
#include <vector>

2
libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc
View file

@ -18,7 +18,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1242 }
// { dg-error "no matching" "" { target *-*-* } 1246 }
#include <vector>

2
libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc
View file

@ -18,7 +18,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1242 }
// { dg-error "no matching" "" { target *-*-* } 1246 }
#include <vector>
#include <utility>

2
libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc
View file

@ -18,7 +18,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1357 }
// { dg-error "no matching" "" { target *-*-* } 1361 }
#include <vector>