diff options
| author | Michael Biebl <biebl@debian.org> | 2012-05-12 19:12:01 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-05-12 19:12:01 +0000 |
| commit | 92bae7fb7086048ad6edeccb2d886ab9bc21bbac (patch) | |
| tree | c8bbf1808d3624733b6959d76ed07c8169a8a579 | |
| parent | Mark zenity as Multi-Arch: foreign (thanks, Stéphane Graber). (diff) | |
| download | zenity-92bae7fb7086048ad6edeccb2d886ab9bc21bbac.tar.gz zenity-92bae7fb7086048ad6edeccb2d886ab9bc21bbac.tar.bz2 zenity-92bae7fb7086048ad6edeccb2d886ab9bc21bbac.zip | |
debian/patches/02_fix_segfault_in_listview.patch: Fix segfault in
listview. Patch cherry-picked from upstream Git. Closes: #668292
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/patches/02_fix_segfault_in_listview.patch | 29 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 35 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index d38b603f..6fa97c81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ zenity (3.4.0-2) UNRELEASED; urgency=low + [ Jordi Mallach ] * Mark zenity as Multi-Arch: foreign (thanks, Stéphane Graber). + [ Michael Biebl ] + * debian/patches/02_fix_segfault_in_listview.patch: Fix segfault in + listview. Patch cherry-picked from upstream Git. Closes: #668292 + -- Jordi Mallach <jordi@debian.org> Fri, 04 May 2012 21:15:20 +0200 zenity (3.4.0-1) unstable; urgency=low diff --git a/debian/patches/02_fix_segfault_in_listview.patch b/debian/patches/02_fix_segfault_in_listview.patch new file mode 100644 index 00000000..662a6290 --- /dev/null +++ b/debian/patches/02_fix_segfault_in_listview.patch @@ -0,0 +1,29 @@ +diff --git a/src/tree.c b/src/tree.c +index ad4a6d1..b347b15 100644 +--- a/src/tree.c ++++ b/src/tree.c +@@ -120,13 +120,13 @@ zenity_tree_handle_stdin (GIOChannel *channel, + + string = g_string_new (NULL); + +- while (channel->is_readable != TRUE) ++ while ((g_io_channel_get_flags(channel) & G_IO_FLAG_IS_READABLE) != G_IO_FLAG_IS_READABLE) + ; + do { + gint status; + + do { +- if (channel->is_readable == TRUE) ++ if (g_io_channel_get_flags(channel) & G_IO_FLAG_IS_READABLE) + status = g_io_channel_read_line_string (channel, string, NULL, &error); + else + return FALSE; +@@ -645,7 +645,7 @@ zenity_tree_dialog_response (GtkWidget *widget, int response, gpointer data) + zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC); + break; + } +- if (channel->is_readable == TRUE) ++ if (channel != NULL && g_io_channel_get_flags (channel) & G_IO_FLAG_IS_READABLE) + g_io_channel_shutdown (channel, TRUE, NULL); + + gtk_main_quit (); diff --git a/debian/patches/series b/debian/patches/series index 777963c8..4e5e3421 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01_dont_quit_zenity_when_stdin_ends.patch +02_fix_segfault_in_listview.patch |