rpms/gtk2/devel gtk+-2.10.4-path-check.patch, NONE, 1.1 gtk2.spec, 1.188, 1.189

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1583

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.10.4-path-check.patch 
Log Message:
Avoid a possible segfault


gtk+-2.10.4-path-check.patch:
 gtkfilechooserbutton.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE gtk+-2.10.4-path-check.patch ---
--- gtk+-2.10.4/gtk/gtkfilechooserbutton.c.path-check	2006-09-30 09:34:50.000000000 -0400
+++ gtk+-2.10.4/gtk/gtkfilechooserbutton.c	2006-09-30 09:35:27.000000000 -0400
@@ -2207,10 +2207,13 @@
 	    GtkFilePath *base_path;
 
 	    base_path = gtk_file_system_volume_get_base_path (priv->fs, data);
-	    row_found = (paths &&
-			 paths->data &&
-			 gtk_file_path_compare (base_path, paths->data) == 0);
-	    gtk_file_path_free (base_path);
+            if (base_path)
+              {
+	        row_found = (paths &&
+		 	     paths->data &&
+			     gtk_file_path_compare (base_path, paths->data) == 0);
+	        gtk_file_path_free (base_path);
+              }
 	  }
 	  break;
 	default:


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- gtk2.spec	29 Sep 2006 14:24:49 -0000	1.188
+++ gtk2.spec	30 Sep 2006 13:35:19 -0000	1.189
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -35,7 +35,8 @@
 Patch7: gtk+-2.10.2-cursor-blink.patch
 
 # fixed in upstream cvs
-PAtch8: gtk+-2.10.4-deadlock.patch
+Patch8: gtk+-2.10.4-deadlock.patch
+Patch9: gtk=-2.10.4-path-check.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -124,6 +125,7 @@
 %patch7 -p0 -b .cursor-blink
 
 %patch8 -p1 -b .deadlock
+%patch9 -p1 -b .path-check
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -297,6 +299,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Sat Sep 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.4-4
+- Avoid a possible segfault (gnome #358405)
+
 * Fri Sep 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.4-3
 - Fix a possible deadlock when not using the gnome-vfs
   filesystem backend