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

re PR libstdc++/63840 (std::function copy constructor deletes an uninitialized pointer if new fails)

Browse Source 
PR libstdc++/63840
	* include/std/functional (function::function(const function&)): Set
	_M_manager after operations that might throw.
	* include/tr1/functional (function::function(const function&),
	function::function(_Functor, _Useless)): Likewise.
	* testsuite/20_util/function/63840.cc: New.
	* testsuite/tr1/3_function_objects/function/63840.cc: New.

From-SVN: r218215
This commit is contained in:
Jonathan Wakely 2014-12-01 13:49:20 +00:00 committed by Jonathan Wakely
parent 31a46aa7d4
commit 7b55fa54d4
5 changed files with 123 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,13 @@
2014-12-01 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/63840
* include/std/functional (function::function(const function&)): Set
_M_manager after operations that might throw.
* include/tr1/functional (function::function(const function&),
function::function(_Functor, _Useless)): Likewise.
* testsuite/20_util/function/63840.cc: New.
* testsuite/tr1/3_function_objects/function/63840.cc: New.
2014-11-30 Jonathan Wakely <jwakely@redhat.com>
* config/abi/pre/gnu.ver: Fix ios_base::failure exports.

2
libstdc++-v3/include/std/functional
View File

@ -2239,9 +2239,9 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type)
{
if (static_cast<bool>(__x))
{
__x._M_manager(_M_functor, __x._M_functor, __clone_functor);
_M_invoker = __x._M_invoker;
_M_manager = __x._M_manager;
__x._M_manager(_M_functor, __x._M_functor, __clone_functor);
}
}

4
libstdc++-v3/include/tr1/functional
View File

@ -2112,9 +2112,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
if (static_cast<bool>(__x))
{
__x._M_manager(_M_functor, __x._M_functor, __clone_functor);
_M_invoker = __x._M_invoker;
_M_manager = __x._M_manager;
__x._M_manager(_M_functor, __x._M_functor, __clone_functor);
}
}
@ -2130,9 +2130,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
if (_My_handler::_M_not_empty_function(__f))
{
_My_handler::_M_init_functor(_M_functor, __f);
_M_invoker = &_My_handler::_M_invoke;
_M_manager = &_My_handler::_M_manager;
_My_handler::_M_init_functor(_M_functor, __f);
}
}

55
libstdc++-v3/testsuite/20_util/function/63840.cc Normal file
View File

@ -0,0 +1,55 @@
// 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" }
#include <functional>
#include <stdexcept>
#include <testsuite_hooks.h>
struct functor
{
functor() = default;
functor(const functor&)
{
throw std::runtime_error("test");
}
functor(functor&& f) = default;
void operator()() const { }
};
void
test01()
{
std::function<void()> f = functor{};
try {
auto g = f;
} catch (const std::runtime_error& e) {
return;
}
VERIFY(false);
}
int
main()
{
test01();
}

55
libstdc++-v3/testsuite/tr1/3_function_objects/function/63840.cc Normal file
View File

@ -0,0 +1,55 @@
// 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/>.
#include <tr1/functional>
#include <stdexcept>
#include <testsuite_hooks.h>
struct functor
{
functor() : copies(0) { }
functor(const functor& f)
: copies(f.copies + 1)
{
if (copies > 1)
throw std::runtime_error("functor");
}
void operator()() const { }
int copies;
};
void
test01()
{
std::tr1::function<void()> f = functor();
try {
std::tr1::function<void()> g = f;
} catch (const std::runtime_error& e) {
return;
}
VERIFY(false);
}
int
main()
{
test01();
}