[tracker/f17] Fix a frequent crash in the png extractor

[Matthias Clasen]

commit 02a6be3947c33dc70bda188a3024e42746f7f78c
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Feb 26 07:42:31 2013 -0500

    Fix a frequent crash in the png extractor

 ...-Avoid-a-double-free-in-the-png-extractor.patch |   28 ++++++++++++++++++++
 tracker.spec                                       |    9 +++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/0001-Avoid-a-double-free-in-the-png-extractor.patch b/0001-Avoid-a-double-free-in-the-png-extractor.patch
new file mode 100644
index 0000000..4f5de04
--- /dev/null
+++ b/0001-Avoid-a-double-free-in-the-png-extractor.patch
@@ -0,0 +1,28 @@
+From 4306640699f53624358ad751cbc15007c7166130 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Mon, 25 Feb 2013 23:51:31 -0500
+Subject: [PATCH] Avoid a double-free in the png extractor
+
+The software member of the exif data was getting freed twice. So
+whenever you deal with a png that has this field set to a non-NULL
+value, you get a segfault.
+https://bugzilla.gnome.org/show_bug.cgi?id=660965
+---
+ src/tracker-extract/tracker-extract-png.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c
+index eea147f..58d19d3 100644
+--- a/src/tracker-extract/tracker-extract-png.c
++++ b/src/tracker-extract/tracker-extract-png.c
+@@ -372,7 +372,6 @@ read_metadata (TrackerSparqlBuilder *preupdate,
+ 	}
+ 
+ 	/* TODO: add ontology and store this ed->software */
+-	g_free (ed->software);
+ 
+ 	if (md.creator) {
+ 		gchar *uri = tracker_sparql_escape_uri_printf ("urn:contact:%s", md.creator);
+-- 
+1.8.1.4
+
diff --git a/tracker.spec b/tracker.spec
index 0587be4..3807edc 100644
--- a/tracker.spec
+++ b/tracker.spec
@@ -1,7 +1,7 @@
 Summary:	Desktop-neutral search tool and indexer
 Name:		tracker
 Version:	0.14.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://projects.gnome.org/tracker/
@@ -11,6 +11,9 @@ Source0:	http://download.gnome.org/sources/tracker/0.14/%{name}-%{version}.tar.x
 # https://bugzilla.redhat.com/show_bug.cgi?id=771601
 Patch1:		tracker-0.14.5-onlyshowin.patch
 
+# upstream fix
+Patch2:         0001-Avoid-a-double-free-in-the-png-extractor.patch
+
 BuildRequires:	poppler-glib-devel evolution-devel libxml2-devel libgsf-devel libgxps-devel
 BuildRequires:	libuuid-devel dbus-glib-devel
 BuildRequires:	nautilus-devel
@@ -119,6 +122,7 @@ This package contains the documentation for tracker
 %prep
 %setup -q
 %patch1 -p0 -b .onlyshowin
+%patch2 -p1 -b .pngcrash
 
 %global evo_plugins_dir %(pkg-config evolution-plugin-3.0 --variable=plugindir)
 
@@ -266,6 +270,9 @@ fi
 %{_datadir}/gtk-doc/html/ontology/
 
 %changelog
+* Tue Feb 26 2013 Matthias Clasen <mclasen at redhat.com> - 0.14.5-2
+- Fix frequent crashes in the png extractor (#837905)
+
 * Wed Feb 20 2013 Deji Akingunola <dakingun at gmail.com> - 0.14.5-1
 - Update to 0.14.5 (http://download.gnome.org/sources/tracker/0.14/tracker-0.14.5.changes)
 - Build with XPS support, fix building with GNOME keyring support.(Ville Skyttä)