r20255 - in /packages/unstable/loudmouth/debian: changelog patches/03-drop-stanzas-on-fail.patch

[jonny at users.alioth.debian.org]

Author: jonny
Date: Thu Jun  4 17:02:04 2009
New Revision: 20255

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20255
Log:
* debian/patches/03-drop-stanzas-on-fail.patch:
  - Added. Drop stanzas that can't be parsed instead of blocking the
    parser. Patch from upstream bug tracker.

Added:
    packages/unstable/loudmouth/debian/patches/03-drop-stanzas-on-fail.patch
Modified:
    packages/unstable/loudmouth/debian/changelog

Modified: packages/unstable/loudmouth/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/loudmouth/debian/changelog?rev=20255&op=diff
==============================================================================
--- packages/unstable/loudmouth/debian/changelog (original)
+++ packages/unstable/loudmouth/debian/changelog Thu Jun  4 17:02:04 2009
@@ -1,8 +1,11 @@
 loudmouth (1.4.3-3) UNRELEASED; urgency=low
 
   * debian/control: Added myself to Uploaders.
-
- -- Jonny Lamb <jonny at debian.org>  Thu, 04 Jun 2009 17:56:57 +0100
+  * debian/patches/03-drop-stanzas-on-fail.patch:
+    - Added. Drop stanzas that can't be parsed instead of blocking the
+      parser. Patch from upstream bug tracker.
+
+ -- Jonny Lamb <jonny at debian.org>  Thu, 04 Jun 2009 17:59:52 +0100
 
 loudmouth (1.4.3-2) unstable; urgency=low
 

Added: packages/unstable/loudmouth/debian/patches/03-drop-stanzas-on-fail.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/loudmouth/debian/patches/03-drop-stanzas-on-fail.patch?rev=20255&op=file
==============================================================================
--- packages/unstable/loudmouth/debian/patches/03-drop-stanzas-on-fail.patch (added)
+++ packages/unstable/loudmouth/debian/patches/03-drop-stanzas-on-fail.patch Thu Jun  4 17:02:04 2009
@@ -1,0 +1,45 @@
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Tue, 13 Jan 2009 11:28:44 +0000
+Subject: [PATCH] Drop stanzas when failing to convert them to LmMessages
+
+when a stanza comes in that for some reason can't be parsed into an LmMessage,
+just drop them on the floor instead of blocking the parser. I've seen this
+issue happen in practise because some (buggy?) client sending an iq with a
+prefix e.g. <client:iq xmlns:client="jabber:client" ... />
+---
+ loudmouth/lm-parser.c |   15 ++++++---------
+ 1 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/loudmouth/lm-parser.c b/loudmouth/lm-parser.c
+index 1938d56..89f6675 100644
+--- a/loudmouth/lm-parser.c
++++ b/loudmouth/lm-parser.c
+@@ -151,19 +151,16 @@ parser_end_node_cb (GMarkupParseContext  *context,
+ 		if (!m) {
+ 			g_warning ("Couldn't create message: %s\n",
+ 				   parser->cur_root->name);
+-			return;
+-		}
+-
+-		g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
++		} else {
++			g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
+ 		       "Have a new message\n");
+-		if (parser->function) {
+-			(* parser->function) (parser, m, parser->user_data);
++			if (parser->function) {
++				(* parser->function) (parser, m, parser->user_data);
++			}
++			lm_message_unref (m);
+ 		}
+ 
+-		lm_message_unref (m);
+ 		lm_message_node_unref (parser->cur_root);
+-		
+-			
+ 		parser->cur_node = parser->cur_root = NULL;
+ 	} else {
+ 		LmMessageNode *tmp_node;
+-- 
+1.5.6.5
+