changeset 13910:6c907830a45f

[gaim-migrate @ 16408] Get rid of an assertion failure that I hit committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 03 Jul 2006 01:39:51 +0000
parents 8264f52a1142
children b210409cdc56
files src/protocols/bonjour/bonjour.c src/protocols/bonjour/jabber.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/bonjour/bonjour.c	Mon Jul 03 00:37:41 2006 +0000
+++ b/src/protocols/bonjour/bonjour.c	Mon Jul 03 01:39:51 2006 +0000
@@ -556,7 +556,7 @@
 #endif
 
 	/* Try to figure out a good host name to use */
-	/* TODO: Avoiding 'localhost,' if possible */
+	/* TODO: Avoid 'localhost,' if possible */
 	if (gethostname(hostname, 255) != 0) {
 		gaim_debug_warning("bonjour", "Error %d when getting host name.  Using \"localhost.\"\n", errno);
 		strcpy(hostname, "localhost");
--- a/src/protocols/bonjour/jabber.c	Mon Jul 03 00:37:41 2006 +0000
+++ b/src/protocols/bonjour/jabber.c	Mon Jul 03 01:39:51 2006 +0000
@@ -379,7 +379,8 @@
 		_jabber_parse_and_write_message_to_ui(message, account->gc, gb);
 	}
 
-	xmlnode_free(message_node);
+	if (message_node != NULL)
+		xmlnode_free(message_node);
 }
 
 static void