summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjellahlstedt@gmail.com>2019-07-08 16:23:53 +0200
committerKjell Ahlstedt <kjellahlstedt@gmail.com>2019-07-08 16:23:53 +0200
commit0d5eb6516cbec8f8eaacf907930a04e058700878 (patch)
tree014bf397743886f07a723f7e7fa0b38030a8ee82
parent17904b2a8555649315e7349e7809c37535eb92dd (diff)
downloadglibmm-0d5eb6516cbec8f8eaacf907930a04e058700878.tar.gz
Glib::Variant<std::tuple<>>::create(): Fix memory leak
Fixes #48
-rw-r--r--glib/src/variant.hg5
1 files changed, 3 insertions, 2 deletions
diff --git a/glib/src/variant.hg b/glib/src/variant.hg
index 40732fe1..662448f3 100644
--- a/glib/src/variant.hg
+++ b/glib/src/variant.hg
@@ -26,6 +26,7 @@ _DEFS(glibmm,glib)
#include <utility>
#include <vector>
#include <map>
+#include <memory>
#include <tuple>
#include <stdexcept>
#include <typeinfo>
@@ -1593,13 +1594,13 @@ Variant<std::tuple<Types...>>::create(const std::tuple<Types...>& data)
detail::expand_tuple(variants, data, detail::index_sequence_for<Types...>{});
using var_ptr = GVariant*;
- var_ptr* const var_array = new var_ptr[sizeof... (Types)];
+ std::unique_ptr<var_ptr[]> var_array(new var_ptr[sizeof... (Types)]);
for (std::vector<VariantBase>::size_type i = 0; i < variants.size(); i++)
var_array[i] = const_cast<GVariant*>(variants[i].gobj());
Variant<std::tuple<Types...>> result = Variant<std::tuple<Types...>>(
- g_variant_new_tuple(var_array, variants.size()));
+ g_variant_new_tuple(var_array.get(), variants.size()));
return result;
}