r34795 - in /desktop/unstable/zenity/debian: changelog patches/02_fix_segfault_in_listview.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat May 12 19:12:01 2012
New Revision: 34795

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34795
Log:
debian/patches/02_fix_segfault_in_listview.patch: Fix segfault in
listview. Patch cherry-picked from upstream Git. Closes: #668292

Added:
    desktop/unstable/zenity/debian/patches/02_fix_segfault_in_listview.patch
Modified:
    desktop/unstable/zenity/debian/changelog
    desktop/unstable/zenity/debian/patches/series

Modified: desktop/unstable/zenity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/zenity/debian/changelog?rev=34795&op=diff
==============================================================================
--- desktop/unstable/zenity/debian/changelog [utf-8] (original)
+++ desktop/unstable/zenity/debian/changelog [utf-8] Sat May 12 19:12:01 2012
@@ -1,6 +1,11 @@
 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 at debian.org>  Fri, 04 May 2012 21:15:20 +0200
 

Added: desktop/unstable/zenity/debian/patches/02_fix_segfault_in_listview.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/zenity/debian/patches/02_fix_segfault_in_listview.patch?rev=34795&op=file
==============================================================================
--- desktop/unstable/zenity/debian/patches/02_fix_segfault_in_listview.patch (added)
+++ desktop/unstable/zenity/debian/patches/02_fix_segfault_in_listview.patch [utf-8] Sat May 12 19:12:01 2012
@@ -1,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 ();

Modified: desktop/unstable/zenity/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/zenity/debian/patches/series?rev=34795&op=diff
==============================================================================
--- desktop/unstable/zenity/debian/patches/series [utf-8] (original)
+++ desktop/unstable/zenity/debian/patches/series [utf-8] Sat May 12 19:12:01 2012
@@ -1,1 +1,2 @@
 01_dont_quit_zenity_when_stdin_ends.patch
+02_fix_segfault_in_listview.patch