# HG changeset patch
# User Christopher O'Brien <siege@pidgin.im>
# Date 1137429300 0
# Node ID 7dc00a9dfba5ea96bf2b4262302f3a9e5639d1b0
# Parent  31e3c4f78aa4ee6f74c661d0de0a32b3705d883e
[gaim-migrate @ 15247]
serv_got_chat_in will segfault on a NULL message, so let's make it check for NULL before calling strlen

committer: Tailor Script <tailor@pidgin.im>

diff -r 31e3c4f78aa4 -r 7dc00a9dfba5 src/server.c
--- a/src/server.c	Mon Jan 16 10:24:49 2006 +0000
+++ b/src/server.c	Mon Jan 16 16:35:00 2006 +0000
@@ -780,6 +780,9 @@
 	char *buffy, *angel;
 	int plugin_return;
 
+	g_return_if_fail(who != NULL);
+	g_return_if_fail(message != NULL);
+
 	for (bcs = g->buddy_chats; bcs != NULL; bcs = bcs->next) {
 		conv = (GaimConversation *)bcs->data;
 
@@ -812,10 +815,8 @@
 								  &angel, &buffy, conv, &flags));
 
 	if (!buffy || !angel || plugin_return) {
-		if (buffy)
-			g_free(buffy);
-		if (angel)
-			g_free(angel);
+		g_free(buffy);
+		g_free(angel);
 		return;
 	}
 	who = angel;