From 976e89a13731034a95349e723943c9059a93963b Mon Sep 17 00:00:00 2001
From: Emil Dotchevski <emil@revergestudios.com>
Date: Sat, 4 Sep 2010 00:43:24 +0000
Subject: [PATCH] fixing obscure, extremely rare double- free() bug in
 clone_current_exception_msvc.cpp

[SVN r65228]
---
 src/clone_current_exception_msvc.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/clone_current_exception_msvc.cpp b/src/clone_current_exception_msvc.cpp
index 5a132e8..73914bc 100644
--- a/src/clone_current_exception_msvc.cpp
+++ b/src/clone_current_exception_msvc.cpp
@@ -157,10 +157,10 @@ namespace
         assert(src!=0);
         cpp_type_info const & ti=get_cpp_type_info(et);
         if( void * dst = malloc(ti.size) )
+            {
             try
                 {
                 copy_msvc_exception(dst,src,ti);
-                return boost::shared_ptr<void>(dst,exception_object_deleter(et));
                 }
             catch(
             ... )
@@ -168,6 +168,8 @@ namespace
                 free(dst);
                 throw;
                 }
+            return boost::shared_ptr<void>(dst,exception_object_deleter(et));
+            }
         else
             throw std::bad_alloc();
         }