boostorg/exception
1
0
Fork 1
mirror of https://github.com/boostorg/exception.git synced 2025-07-30 04:27:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixing minor memory leak in the non-intrusive MSVC exception_ptr support.

Browse Source 
[SVN r65206]
This commit is contained in:
Emil Dotchevski
2010-09-03 07:15:47 +00:00
parent 12903d4e49
commit d637e8efc7
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/clone_current_exception_msvc.cpp
View File

@ -3,6 +3,7 @@
//Distributed under the Boost Software License, Version 1.0. (See accompanying //Distributed under the Boost Software License, Version 1.0. (See accompanying
//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//This MSVC-specific cpp file implements non-intrusive cloning of exception objects.
//Based on an exception_ptr implementation by Anthony Williams. //Based on an exception_ptr implementation by Anthony Williams.
#ifdef BOOST_NO_EXCEPTIONS #ifdef BOOST_NO_EXCEPTIONS
@ -155,11 +156,20 @@ namespace
{ {
assert(src!=0); assert(src!=0);
cpp_type_info const & ti=get_cpp_type_info(et); cpp_type_info const & ti=get_cpp_type_info(et);
void * dst = malloc(ti.size); if( void * dst = malloc(ti.size) )
if( !dst ) try
{
copy_msvc_exception(dst,src,ti);
return boost::shared_ptr<void>(dst,exception_object_deleter(et));
}
catch(
... )
{
free(dst);
throw;
}
else
throw std::bad_alloc(); throw std::bad_alloc();
copy_msvc_exception(dst,src,ti);
return boost::shared_ptr<void>(dst,exception_object_deleter(et));
} }
class class