rpms/tracker
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Add patch to fix FS miner crash (#1246896)

Browse Source
This commit is contained in:
David King 2015-08-25 10:32:51 +01:00
parent f52f26f622
commit 25f0eeb141
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tracker-1.5.2-fix-fs-miner-crash.patch Normal file
View File

@ -0,0 +1,30 @@
From 9e2682ecd7ed17033e63e49f847a7d74a43f3f88 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Tue, 25 Aug 2015 10:28:34 +0100
Subject: [PATCH] tracker-miner-fs: avoid crash during init
Correctly handle the result of tracker_sparql_cursor_get_string(), which
can be NULL.
https://bugzilla.gnome.org/show_bug.cgi?id=754055
---
src/miners/fs/tracker-miner-files.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index fb7445f..527c6e5 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -929,6 +929,9 @@ init_mount_points (TrackerMinerFiles *miner_files)
urn = tracker_sparql_cursor_get_string (cursor, 0, NULL);
+ if (!urn)
+ continue;
+
if (strcmp (urn, TRACKER_DATASOURCE_URN_NON_REMOVABLE_MEDIA) == 0) {
/* Report non-removable media to be mounted by HAL as well */
state |= VOLUME_MOUNTED;
--
2.5.0

9
tracker.spec
View File

@ -16,7 +16,7 @@
Name: tracker
Version: 1.5.2
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Desktop-neutral search tool and indexer
Group: Applications/System
@ -28,6 +28,9 @@ Source0: https://download.gnome.org/sources/%{name}/1.5/%{name}-%{version
# https://bugzilla.redhat.com/show_bug.cgi?id=771601
Patch0: 0001-Only-autostart-in-GNOME-771601.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1246896
Patch1: tracker-1.5.2-fix-fs-miner-crash.patch
BuildRequires: desktop-file-utils
BuildRequires: firefox
BuildRequires: giflib-devel
@ -174,6 +177,7 @@ This package contains the documentation for tracker
%setup -q
%patch0 -p1 -b .autostart-gnome
%patch1 -p1 -b .miner-crash
## nuke unwanted rpaths, see also
## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
@ -328,6 +332,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Tue Aug 25 2015 David King <amigadave@amigadave.com> - 1.5.2-2
- Add patch to fix FS miner crash (#1246896)
* Thu Aug 20 2015 Kalev Lember <klember@redhat.com> - 1.5.2-1
- Update to 1.5.2
- Use make_install macro