rpms/yelp/F-8 search-crash.patch,NONE,1.1 yelp.spec,1.114,1.115

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/yelp/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6411

Modified Files:
	yelp.spec 
Added Files:
	search-crash.patch 
Log Message:
fix another crash


search-crash.patch:

--- NEW FILE search-crash.patch ---
diff -up yelp-2.20.0/src/yelp-search-parser.c.search-crash yelp-2.20.0/src/yelp-search-parser.c
--- yelp-2.20.0/src/yelp-search-parser.c.search-crash	2007-09-17 16:49:09.000000000 -0400
+++ yelp-2.20.0/src/yelp-search-parser.c	2007-11-05 18:13:09.000000000 -0500
@@ -1074,8 +1074,11 @@ slow_search_process (RrnReg *reg, Search
 
     ptr = g_strrstr (container->base_filename, "/");
     
-    path = g_strndup (container->base_filename, 
-		      ptr - container->base_filename);
+    if (ptr)
+        path = g_strndup (container->base_filename, 
+			  ptr - container->base_filename);
+    else
+	path = g_strdup (container->base_filename);
     
     /* BEGIN HTML special block */
     if (reg->type && (g_str_equal (reg->type, "text/html") ||


Index: yelp.spec
===================================================================
RCS file: /cvs/extras/rpms/yelp/F-8/yelp.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- yelp.spec	5 Nov 2007 16:04:14 -0000	1.114
+++ yelp.spec	5 Nov 2007 23:23:28 -0000	1.115
@@ -20,7 +20,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.20.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.19/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -29,6 +29,9 @@
 Patch3: yelp-2.15.91-use-pango.patch 
 # http://bugzilla.gnome.org/show_bug.cgi?id=493594 
 Patch4: rarian-crash.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=493751 
+Patch5: search-crash.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=431077 
 # XXX Does this no longer apply to yelp >= 2.19.1 ?
 #Patch8: yelp-2.18.1-posix-man.patch
@@ -87,6 +90,8 @@
 %patch2 -p1 -b .add-mime-handling
 %patch3 -p1 -b .use-pango
 %patch4 -p1 -b .rarian-crash
+%patch5 -p1 -b .search-crash
+
 #%patch8 -p1 -b .posix-man
 
 %build
@@ -151,6 +156,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Mon Nov  5 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-5
+- Fix a crash in search (#361041)
+
 * Mon Nov  5 2007 Martin Stransky <stransky at redhat.com> - 2.20.0-4
 - Rebuild against new firefox