fix a possible crash

This commit is contained in:
Matthias Clasen 2009-08-13 14:08:20 +00:00
parent c67bb4fbd3
commit 242f873af7
2 changed files with 32 additions and 1 deletions

24
appearance-crash.patch Normal file
View File

@ -0,0 +1,24 @@
diff -up gtk+-2.17.7/gtk/gtkiconview.c.appearance-crash gtk+-2.17.7/gtk/gtkiconview.c
--- gtk+-2.17.7/gtk/gtkiconview.c.appearance-crash 2009-08-13 10:03:01.717854077 -0400
+++ gtk+-2.17.7/gtk/gtkiconview.c 2009-08-13 10:03:31.483855146 -0400
@@ -3498,16 +3498,16 @@ gtk_icon_view_get_item_at_coords (GtkIco
{
if (cell_at_pos)
*cell_at_pos = info;
-
+
return item;
}
}
- if (only_in_cell)
- return NULL;
-
if (cell_at_pos)
*cell_at_pos = NULL;
+
+ if (only_in_cell)
+ return NULL;
}
return item;

View File

@ -17,7 +17,7 @@
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk2
Version: %{base_version}
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
Source: http://download.gnome.org/sources/gtk+/2.17/gtk+-%{version}.tar.bz2
@ -30,6 +30,9 @@ Patch0: gtk+-2.13.5-lib64.patch
# http://bugzilla.redhat.com/show_bug.cgi?id=478400
# Patch1: default_printer.patch
# fixed upstream
Patch2: appearance-crash.patch
BuildRequires: atk-devel >= %{atk_version}
BuildRequires: pango-devel >= %{pango_version}
BuildRequires: glib2-devel >= %{glib2_version}
@ -141,6 +144,7 @@ This package contains developer documentation for the GTK+ widget toolkit.
%patch0 -p1 -b .lib64
# %patch1 -p0 -b .default-printer
%patch2 -p1 -b .appearance-crash
# make sure that gtkmarshalers.{c, h} get regenerated during the build
# - caused by print_authentication.patch
@ -385,6 +389,9 @@ fi
%changelog
* Thu Aug 13 2009 Matthias Clasen <mclasen@redhat.com> - 2.17.7-2
- Fix a possible crash
* Tue Aug 11 2009 Matthias Clasen <mclasen@redhat.com> - 2.17.7-1
- 2.17.7