changeset 26779:d387f1164b3a

merge of '9dd1c4c3db68a80dbf157a0c0bc0c723e42b7a6e' and 'b786784e702c7cc7da7894e0de379cdaf56598c2'
author Ka-Hing Cheung <khc@hxbc.us>
date Sat, 02 May 2009 19:14:07 +0000
parents a6724cd174f1 (current diff) 93bf089e6233 (diff)
children 5c4a4a0f5929 5d4400b197d5 bf7b3cd5ed25
files
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c	Sat May 02 19:12:33 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat May 02 19:14:07 2009 +0000
@@ -383,6 +383,11 @@
 			char *data_start, *tag_end = strchr(tag_start, '>');
 			text = g_strdup(data);
 
+			/* Better to print out some wacky debugging than crash
+			 * due to a plugin sending bad xml */
+			if (tag_end == NULL)
+				tag_end = tag_start;
+
 			data_start = text + (tag_end - data) + 1;
 
 			last_part = strchr(data_start, '<');