rpms/yelp/devel yelp-2.16.1-crash-fixes.patch, NONE, 1.1 yelp.spec, 1.81, 1.82

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28032

Modified Files:
	yelp.spec 
Added Files:
	yelp-2.16.1-crash-fixes.patch 
Log Message:
fix some crashes


yelp-2.16.1-crash-fixes.patch:
 yelp-info-parser.c  |    1 -
 yelp-search-pager.c |    9 +++++++++
 yelp-utils.c        |    4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE yelp-2.16.1-crash-fixes.patch ---
--- yelp-2.16.1/src/yelp-search-pager.c.crash-fixes	2006-10-29 23:15:25.000000000 -0500
+++ yelp-2.16.1/src/yelp-search-pager.c	2006-10-29 23:15:37.000000000 -0500
@@ -1449,6 +1449,15 @@
     else
 	lang = "C";
     
+    if (!strcmp (pager->priv->search_terms, "")) {
+	pager->priv->slow_search_setup_process_id = 0;
+	priv->xslt_process_id =
+	    g_idle_add_full (G_PRIORITY_LOW,
+			     (GSourceFunc) process_xslt,
+			     pager, NULL);
+	return FALSE;
+    }
+
     command = g_strconcat("scrollkeeper-get-content-list ", lang, NULL);
     
     if (g_spawn_command_line_sync (command, &content_list, &stderr_str, NULL, NULL)) {
--- yelp-2.16.1/src/yelp-utils.c.crash-fixes	2006-10-29 23:12:11.000000000 -0500
+++ yelp-2.16.1/src/yelp-utils.c	2006-10-29 23:12:29.000000000 -0500
@@ -788,7 +788,9 @@
 
 	if (!g_spawn_command_line_sync ("manpath", &manp, NULL, NULL, NULL))
 	    manp = g_strdup (g_getenv ("MANPATH"));
-
+	if (!manp) {
+	    return NULL;
+	}
 	g_strstrip (manp);
 	manpath = g_strsplit (manp, ":", -1);
 
--- yelp-2.16.1/src/yelp-info-parser.c.crash-fixes	2006-10-29 23:16:11.000000000 -0500
+++ yelp-2.16.1/src/yelp-info-parser.c	2006-10-29 23:16:20.000000000 -0500
@@ -1096,7 +1096,6 @@
 
 	    new_url = g_strdup (lurl);
 	    info = strstr (new_url, ".info)");
-	    g_free (lurl);
 	    stripped = g_strndup (new_url, info-new_url);
 	    info +=5;
 	    lurl = g_strconcat (stripped, info, NULL);


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- yelp.spec	27 Oct 2006 19:37:32 -0000	1.81
+++ yelp.spec	30 Oct 2006 03:16:39 -0000	1.82
@@ -19,12 +19,14 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.16.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.15.5-fedora-docs.patch
 Patch2: yelp-2.13.2-add-mime-handling.patch
 Patch3: yelp-2.15.91-use-pango.patch 
+# backports from cvs 
+Patch4: yelp-2.16.1-crash-fixes.patch
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-root
@@ -81,6 +83,7 @@
 %patch1 -p1 -b .fedora-docs
 %patch2 -p1 -b .add-mime-handling
 %patch3 -p1 -b .use-pango
+%patch4 -p1 -b .crash-fixes
 
 %build
 %configure 			\
@@ -141,7 +144,10 @@
 %{_datadir}/yelp
 
 %changelog
-* Fri Oct 27 2006 Christopher Aillon <caillon at redhat.com> - .2.16.1-2
+* Sun Oct 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.1-3
+- Fix some crashes (#212888)
+
+* Fri Oct 27 2006 Christopher Aillon <caillon at redhat.com> - 2.16.1-2
 - Rebuild against newer gecko
 
 * Sun Oct 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.1-1