[geeqie] Patch another place where not to exif_free_fd NULL ptr (#728802).

Michael Schwendt mschwendt at fedoraproject.org
Tue Aug 9 10:32:40 UTC 2011


commit 8d5715f79680da9aa17383dfb4952303d6c9640c
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Tue Aug 9 12:32:27 2011 +0200

    Patch another place where not to exif_free_fd NULL ptr (#728802).

 geeqie-1.0-exif-728802.patch |   11 +++++++++++
 geeqie.spec                  |   14 +++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/geeqie-1.0-exif-728802.patch b/geeqie-1.0-exif-728802.patch
new file mode 100644
index 0000000..3da8cc2
--- /dev/null
+++ b/geeqie-1.0-exif-728802.patch
@@ -0,0 +1,11 @@
+diff -Nur geeqie-1.0-orig/src/image-load.c geeqie-1.0/src/image-load.c
+--- geeqie-1.0-orig/src/image-load.c	2010-02-17 22:21:19.000000000 +0100
++++ geeqie-1.0/src/image-load.c	2011-08-09 12:07:28.965109451 +0200
+@@ -632,6 +632,7 @@
+ 			il->preview = TRUE;
+ 			DEBUG_1("Usable reduced size (preview) image loaded from file %s", il->fd->path);
+ 			}
++        if (exif)
+ 		exif_free_fd(il->fd, exif);
+ 		}
+ 
diff --git a/geeqie.spec b/geeqie.spec
index d6bb156..cdedd4e 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -3,13 +3,12 @@
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv3
 Group: User Interface/X
 # svn + autogen
 #Source: geeqie-1.0alpha2-svn-1341.tgz
 Source: http://downloads.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL: http://geeqie.sourceforge.net/
 
 # in upstream patch tracker
@@ -21,6 +20,8 @@ Patch1: geeqie-1.0-exif-filecache.patch
 Patch2: geeqie-1.0-sidecars-case.patch
 #
 Patch3: geeqie-1.0-vflist-refresh.patch
+# bz 728802
+Patch4: geeqie-1.0-exif-728802.patch
 
 BuildRequires: gtk2-devel
 BuildRequires: lcms-devel
@@ -62,6 +63,7 @@ done
 %patch1 -p1 -b .exif-filecache
 %patch2 -p1 -b .sidecars-case
 %patch3 -p1 -b .vflist-refresh
+%patch4 -p1 -b .exif-728802
 
 
 %build
@@ -71,7 +73,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p" install
 
 # guard against missing HTML tree
@@ -91,10 +92,6 @@ desktop-file-install \
 %find_lang %name
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 update-desktop-database &> /dev/null || :
 
@@ -115,6 +112,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Tue Aug  9 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-11
+- Patch another place where not to exif_free_fd NULL ptr (#728802).
+
 * Fri Apr 15 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-10
 - Let's see how we do with a simpler vflist_setup_iter_recursive().
 


More information about the scm-commits mailing list