Fix lack of exception safety in any component (Closes #16)

mnmlstc · May 21, 2014 · 4a4de4e · 4a4de4e
1 parent f8d44cd
commit 4a4de4e
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/include/core/any.hpp b/include/core/any.hpp
@@ -6,6 +6,7 @@
 #include <memory>
 
 #include <core/type_traits.hpp>
+#include <core/utility.hpp>
 
 namespace core {
 inline namespace v1 {
@@ -60,7 +61,11 @@ struct any_dispatch_select<Type, false> {
     allocator_type alloc { };
     auto const& value = *static_cast<Type* const>(source);
     auto pointer = allocator_traits::allocate(alloc, 1);
+    auto scope = make_scope_guard([&alloc, pointer] {
+      allocator_traits::deallocate(alloc, pointer, 1);
+    });
     allocator_traits::construct(alloc, pointer, value);
+    scope.dismiss();
     data = pointer;
   }