changeset 26751:c33f21f0a73e

merge of '2008f1bd77717e12b27397825b76c19de2fc7314' and '55cc6e317f8651055c17a031024f0304271311cb'
author Paul Aurich <paul@darkrain42.org>
date Wed, 29 Apr 2009 05:22:58 +0000
parents b1f8cebaab17 (diff) 2c08e3e34e02 (current diff)
children 50db9eb2499a
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/caps.c	Wed Apr 29 03:30:01 2009 +0000
+++ b/libpurple/protocols/jabber/caps.c	Wed Apr 29 05:22:58 2009 +0000
@@ -720,6 +720,8 @@
 	info = g_new0(JabberCapsClientInfo, 1);
 
 	for(child = query->child; child; child = child->next) {
+		if (child->type != XMLNODE_TYPE_TAG)
+			continue;
 		if (!strcmp(child->name,"identity")) {
 			/* parse identity */
 			const char *category = xmlnode_get_attrib(child, "category");