diff options
| author | Ray Strode <rstrode@fedoraproject.org> | 2007-04-04 19:50:27 +0000 |
|---|---|---|
| committer | Ray Strode <rstrode@fedoraproject.org> | 2007-04-04 19:50:27 +0000 |
| commit | 66a26c59e226894f150193bfcefe1ffd5c8b98b6 (patch) | |
| tree | 91beb1bf5cfe5a19157f5db02623579cc4678062 | |
| parent | ef30635a3fd35d75482e3a6ea060082a2e7c18ef (diff) | |
| download | gnome-panel-66a26c59e226894f150193bfcefe1ffd5c8b98b6.tar.gz gnome-panel-66a26c59e226894f150193bfcefe1ffd5c8b98b6.tar.xz gnome-panel-66a26c59e226894f150193bfcefe1ffd5c8b98b6.zip | |
- fix invalid read and potentially fix 234544gnome-panel-2_18_0-8_fc7
| -rw-r--r-- | gnome-panel-2.18.0-fix-invalid-read.patch | 38 | ||||
| -rw-r--r-- | gnome-panel.spec | 9 |
2 files changed, 46 insertions, 1 deletions
diff --git a/gnome-panel-2.18.0-fix-invalid-read.patch b/gnome-panel-2.18.0-fix-invalid-read.patch new file mode 100644 index 0000000..7acfb56 --- /dev/null +++ b/gnome-panel-2.18.0-fix-invalid-read.patch @@ -0,0 +1,38 @@ +--- gnome-panel-2.18.0/gnome-panel/panel-run-dialog.c.fix-invalid-read 2007-04-04 15:35:14.000000000 -0400 ++++ gnome-panel-2.18.0/gnome-panel/panel-run-dialog.c 2007-04-04 15:40:24.000000000 -0400 +@@ -111,6 +111,8 @@ + + static PanelRunDialog *static_dialog = NULL; + ++static void panel_run_dialog_disconnect_pixmap (PanelRunDialog *dialog); ++ + static void + panel_run_dialog_destroy (PanelRunDialog *dialog) + { +@@ -165,6 +167,8 @@ + if (dialog->completion) + g_completion_free (dialog->completion); + dialog->completion = NULL; ++ ++ panel_run_dialog_disconnect_pixmap (dialog); + + g_free (dialog); + } +@@ -1905,6 +1909,17 @@ + } + + static void ++panel_run_dialog_disconnect_pixmap (PanelRunDialog *dialog) ++{ ++ g_signal_handlers_disconnect_by_func (dialog->pixmap, ++ G_CALLBACK (panel_run_dialog_style_set), ++ dialog); ++ g_signal_handlers_disconnect_by_func (dialog->pixmap, ++ G_CALLBACK (panel_run_dialog_screen_changed), ++ dialog); ++} ++ ++static void + panel_run_dialog_static_dialog_destroyed (PanelRunDialog *dialog) + { + /* just reset the static dialog to NULL for next time */ diff --git a/gnome-panel.spec b/gnome-panel.spec index 03e6a9b..0d89394 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -22,7 +22,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.18.0 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://www.gnome.org Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.18/%{name}-%{version}.tar.bz2 Source1: redhat-panel-default-setup.entries @@ -104,6 +104,9 @@ Patch19: gnome-panel-2.18.0-update-clock-immediately.patch # http://bugzilla.gnome.org/show_bug.cgi?id=426281 Patch20: gnome-panel-2.18.0-fix-name-too-long-error.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=413921 +Patch21: gnome-panel-2.18.0-fix-invalid-read.patch + Conflicts: gnome-power-manager < 2.15.3 %description @@ -139,6 +142,7 @@ Panel Applets using the libpanel-applet library. %patch18 -p1 -b .hide-lock-menu-if-root %patch19 -p1 -b .update-clock-immediately %patch20 -p1 -b .fix-name-too-long-error +%patch21 -p1 -b .fix-invalid-read . %{SOURCE4} @@ -319,6 +323,9 @@ fi %{_datadir}/gtk-doc %changelog +* Wed Apr 4 2007 Ray Strode <rstrode@redhat.com> - 2.18.0-8 +- fix invalid read and potentially fix 234544 + * Wed Apr 4 2007 Ray Strode <rstrode@redhat.com> - 2.18.0-7 - Allow users to correct desktop launchers when given an error initially (bug 233015) |