r19767 - in /desktop/experimental/libsoup2.4/debian: changelog patches/001_avoid_crash_on_msg_cancel.diff

[kov at users.alioth.debian.org]

Author: kov
Date: Sat Apr 25 14:32:39 2009
New Revision: 19767

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19767
Log:
Patch to avoid a crasher

Added:
    desktop/experimental/libsoup2.4/debian/patches/001_avoid_crash_on_msg_cancel.diff
Modified:
    desktop/experimental/libsoup2.4/debian/changelog

Modified: desktop/experimental/libsoup2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libsoup2.4/debian/changelog?rev=19767&op=diff
==============================================================================
--- desktop/experimental/libsoup2.4/debian/changelog (original)
+++ desktop/experimental/libsoup2.4/debian/changelog Sat Apr 25 14:32:39 2009
@@ -8,6 +8,9 @@
     support
   * debian/rules:
   - re-enable gtk-doc support, and enable GNOME support
+  * debian/patches/001_avoid_crash_on_msg_cancel.diff:
+  - avoids crashing when a message is cancelled during a restarted
+    callback; see http://bugzilla.gnome.org/show_bug.cgi?id=580193)
 
   Changes borrowed from Ubuntu (thanks):
   * debian/control.in, libsoup-gnome2.4-dev:

Added: desktop/experimental/libsoup2.4/debian/patches/001_avoid_crash_on_msg_cancel.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libsoup2.4/debian/patches/001_avoid_crash_on_msg_cancel.diff?rev=19767&op=file
==============================================================================
--- desktop/experimental/libsoup2.4/debian/patches/001_avoid_crash_on_msg_cancel.diff (added)
+++ desktop/experimental/libsoup2.4/debian/patches/001_avoid_crash_on_msg_cancel.diff Sat Apr 25 14:32:39 2009
@@ -1,0 +1,14 @@
+diff --git a/libsoup/soup-session-async.c b/libsoup/soup-session-async.c
+index d9d17e3..66826bc 100644
+--- a/libsoup/soup-session-async.c
++++ b/libsoup/soup-session-async.c
+@@ -303,6 +303,9 @@ request_restarted (SoupMessage *req, gpointer user_data)
+ {
+ 	SoupMessageQueueItem *item = user_data;
+ 
++	if (item->removed)
++		return;
++
+ 	if (item->msg_addr &&
+ 	    item->msg_addr != soup_message_get_address (item->msg)) {
+ 		g_object_unref (item->msg_addr);