Free the allocated memory when deleting an IptcTag.

2 files changed, 14 insertions, 1 deletions

diff --git a/src/exiv2wrapper.cpp b/src/exiv2wrapper.cpp
index de53b94..3cdc2d5 100644
--- a/src/exiv2wrapper.cpp
+++ b/src/exiv2wrapper.cpp
@@ -633,7 +633,9 @@ const std::string ExifTag::getHumanValue()
 
 IptcTag::IptcTag(const std::string& key, Exiv2::IptcMetadata* data): _key(key)
 {
-    if (data != 0)
+    _from_data = (data != 0);
+
+    if (_from_data)
     {
         _data = data;
     }
@@ -664,6 +666,14 @@ IptcTag::IptcTag(const std::string& key, Exiv2::IptcMetadata* data): _key(key)
     }
 }
 
+IptcTag::~IptcTag()
+{
+    if (!_from_data)
+    {
+        delete _data;
+    }
+}
+
 void IptcTag::setRawValues(const boost::python::list& values)
 {
     if (!_repeatable && (boost::python::len(values) > 1))
diff --git a/src/exiv2wrapper.hpp b/src/exiv2wrapper.hpp
index 29c266b..13091dd 100644
--- a/src/exiv2wrapper.hpp
+++ b/src/exiv2wrapper.hpp
@@ -75,6 +75,8 @@ public:
     // Constructor
     IptcTag(const std::string& key, Exiv2::IptcMetadata* data=0);
 
+    ~IptcTag();
+
     void setRawValues(const boost::python::list& values);
 
     const std::string getKey();
@@ -90,6 +92,7 @@ public:
 
 private:
     Exiv2::IptcKey _key;
+    bool _from_data; // whether the tag is built from an existing IptcMetadata
     Exiv2::IptcMetadata* _data; // _data contains only data with _key
     std::string _type;
     std::string _name;