Ticket #2339: boost-destruction-order-fix.diff

boost/interprocess/segment_manager.hpp

@@ -1130 +1130 @@
          if(!buffer_ptr)
             return 0; 
       }
+      
+      //Build scoped ptr to avoid leaks with constructor exception
+      //Memory can only be deallocated after the node is erased
+      detail::mem_algo_deallocator<segment_manager_base_type> mem
+         (buffer_ptr, *static_cast<segment_manager_base_type*>(this));
+
 
       //Now construct the intrusive hook plus the header
       intrusive_value_type * intrusive_hdr = new(buffer_ptr) intrusive_value_type();
@@ -1157 +1163 @@
       //if something goes wrong
       value_eraser<index_type> v_eraser(index, it);
       
-      //Avoid constructions if constructor is trivial
-      //Build scoped ptr to avoid leaks with constructor exception
-      detail::mem_algo_deallocator<segment_manager_base_type> mem
-         (buffer_ptr, *static_cast<segment_manager_base_type*>(this));
-
       //Construct array, this can throw
       detail::array_construct(ptr, num, table);