Free StringExtItem and SimpleExtItem values correctly.

diff --git a/include/extensible.h b/include/extensible.h
index 0efb1db5f133ab7fe782db983da7f4a74c2cd396..c24984f2678672ae1f1a4a3922451772bc8c901f 100644 (file)
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -210,22 +210,19 @@ class SimpleExtItem : public ExtensionItem
        {
                T* ptr = new T(value);
                T* old = static_cast<T*>(set_raw(container, ptr));
-               Del del;
-               del(old);
+               free(container, old);
        }
 
        inline void set(Extensible* container, T* value)
        {
                T* old = static_cast<T*>(set_raw(container, value));
-               Del del;
-               del(old);
+               free(container, old);
        }
 
        inline void unset(Extensible* container)
        {
                T* old = static_cast<T*>(unset_raw(container));
-               Del del;
-               del(old);
+               free(container, old);
        }
 
        void free(Extensible* container, void* item) CXX11_OVERRIDE

diff --git a/src/base.cpp b/src/base.cpp
index b4ea09bc9b330f6393c0c821ad03e66560cc2788..ebd5214dbfee6d3738dfb6b31d15e68a3999f0fe 100644 (file)
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -369,13 +369,13 @@ void StringExtItem::FromNetwork(Extensible* container, const std::string& value)
 void StringExtItem::set(Extensible* container, const std::string& value)
 {
        void* old = set_raw(container, new std::string(value));
-       delete static_cast<std::string*>(old);
+       free(container, old);
 }
 
 void StringExtItem::unset(Extensible* container)
 {
        void* old = unset_raw(container);
-       delete static_cast<std::string*>(old);
+       free(container, old);
 }
 
 void StringExtItem::free(Extensible* container, void* item)