summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-22 21:48:01 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-22 21:48:01 +0100
commit79a871ea740509ff2fa540ca715375e0ba1c4ad9 (patch)
tree0f249f9dc8ce5e8353333a5bdb9ff86b6409a8d6
parent14b1f672dc92ae8e1385c75e30420a4dcb4e32c9 (diff)
Fix large memory leak with image sources.
Reported-by: Ivan Pullman
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/image_proxy.cc2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index de702dacf..cd348ca76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-22 Carl Hetherington <cth@carlh.net>
+
+ * Fix large memory leak with image sources.
+
2014-06-21 Carl Hetherington <cth@carlh.net>
* Move email config into the KDM email page.
diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index 4e2f8a135..ba572c727 100644
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -142,6 +142,8 @@ MagickImageProxy::image () const
p += _image->stride()[0];
}
+ delete magick_image;
+
LOG_TIMING ("[%1] MagickImageProxy completes decode and convert of %2 bytes", boost::this_thread::get_id(), _blob.length());
return _image;