[entangle/f19] Fix leak in raw file thumbnail loading
Daniel P. Berrange
berrange at fedoraproject.org
Fri Aug 30 20:42:34 UTC 2013
commit 58bc6fa56579fd0214e3277d45ef2da18349e707
Author: Daniel P. Berrange <berrange at redhat.com>
Date: Fri Aug 30 19:58:51 2013 +0100
Fix leak in raw file thumbnail loading
entangle-0.5.3-raw-thumbnail-leak.patch | 28 ++++++++++++++++++++++++++++
entangle.spec | 7 ++++++-
2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/entangle-0.5.3-raw-thumbnail-leak.patch b/entangle-0.5.3-raw-thumbnail-leak.patch
new file mode 100644
index 0000000..c43b692
--- /dev/null
+++ b/entangle-0.5.3-raw-thumbnail-leak.patch
@@ -0,0 +1,28 @@
+From 26408199a928270524e96d0c46bfa93d33306b02 Mon Sep 17 00:00:00 2001
+From: "Daniel P. Berrange" <berrange at redhat.com>
+Date: Fri, 30 Aug 2013 19:51:21 +0100
+Subject: [PATCH] Fix memory leak in generating image thumbnals
+
+Fix code for generating thumbnails from raw files to not leak
+reference count on pixbuf.
+
+Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
+---
+ src/backend/entangle-pixbuf.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/backend/entangle-pixbuf.c b/src/backend/entangle-pixbuf.c
+index 1489269..d62b6dc 100644
+--- a/src/backend/entangle-pixbuf.c
++++ b/src/backend/entangle-pixbuf.c
+@@ -337,7 +337,6 @@ static GdkPixbuf *entangle_pixbuf_open_image_preview_raw(EntangleImage *image,
+ result = gdk_pixbuf_loader_get_pixbuf(loader);
+
+ if (result) {
+- g_object_ref(result);
+ if (applyOrientation) {
+ GdkPixbuf *tmp = entangle_pixbuf_auto_rotate(result, metadata);
+ g_object_unref(result);
+--
+1.8.3.1
+
diff --git a/entangle.spec b/entangle.spec
index f30b521..70fabcb 100644
--- a/entangle.spec
+++ b/entangle.spec
@@ -8,10 +8,11 @@
Summary: Tethered shooting & control of digital cameras
Name: entangle
Version: 0.5.3
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
License: GPLv3+
Group: Applications/Multimedia
Source: http://entangle-photo.org/download/sources/%{name}-%{version}.tar.gz
+Patch1: %{name}-%{version}-raw-thumbnail-leak.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://entangle-photo.org/
@@ -47,6 +48,7 @@ and 'hands off' shooting directly from the controlling computer.
%prep
%setup -q
+%patch1 -p1
%build
@@ -115,6 +117,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas ||:
%dir %{_datadir}/%{name}/plugins
%changelog
+* Fri Aug 30 2013 Daniel P. Berrange <berrange at redhat.com> - 0.5.3-2
+- Fix leak loading thumbnails from raw files
+
* Wed Aug 28 2013 Daniel P. Berrange <berrange at redhat.com> - 0.5.3-1
- Update to 0.5.3 release
More information about the scm-commits
mailing list