From c91d353872b7d4e1a39192bff1444b46cab6e5eb Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 14 Feb 2013 15:21:46 +0100 Subject: rhbz#908674: Adapt rtl::Allocator::construct to C++11 ...otherwise, at least with some --with-system-boost versions and C++11 compilers, like with Fedora's boost-1.50.0-4.fc18.x86_64 and gcc-c++-4.7.2-8.fc18.x86_64, using this to copy-construct an instance of boost::unordered::detail::ptr_node> in the call to p_bootstrap_map->insert(...) in rtl_bootstrap_args_open (sal/rtl/source/bootstrap.cxx) would memcopy the ptr_node and fail to call rtl_uString_acquire, leading to memory corruption later on when rtl_uString_release is called one time too often. It is not entirely clear to me whether this is a shortcoming of the given Boost version, but this patch solves the problem and brings rtl::Allocator::construct in line with the (changed) Allocator requirements of C++11 anyway. The problem potentially lurks with every use of rtl::Allocator, but only showed now begining with LO 4.0 where e5111574fd904b38a3980ca4ea3d21cfcb22dea6 "Revert 'sb140: sb140: #i116981# clean up memory upon exit'" re-introduced code into rtl_bootstrap_args_open that inserts into a boost::unordered_map that uses rtl::Allocator. Change-Id: I3be22f59a8eb49d31458480c27f3ce15803c7fd4 --- config_host/config_global.h.in | 1 + 1 file changed, 1 insertion(+) (limited to 'config_host/config_global.h.in') diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in index 0f85b59c3785..5e7150b44581 100644 --- a/config_host/config_global.h.in +++ b/config_host/config_global.h.in @@ -14,6 +14,7 @@ Any change in this header will cause a rebuild of almost everything. #undef HAVE_CXX11_DELETE #undef HAVE_CXX11_OVERRIDE +#undef HAVE_CXX11_PERFECT_FORWARDING #undef HAVE_GCC_BUILTIN_ATOMIC #undef HAVE_SFINAE_ANONYMOUS_BROKEN #undef HAVE_THREADSAFE_STATICS -- cgit