# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1146516226 0
# Node ID 43ebbe768a43e8073777d46b3b6c21b2c0d8cc12
# Parent  967ef719cb624164bc53459540cebcd073e33a5c
[gaim-migrate @ 16116]
Resolve CID 133
Description: Pointer "conv" dereferenced before NULL check

committer: Tailor Script <tailor@pidgin.im>

diff -r 967ef719cb62 -r 43ebbe768a43 src/conversation.c
--- a/src/conversation.c	Mon May 01 20:37:37 2006 +0000
+++ b/src/conversation.c	Mon May 01 20:43:46 2006 +0000
@@ -70,10 +70,12 @@
 	GaimConnection *gc;
 	const char *name;
 
+	g_return_val_if_fail(conv != NULL, FALSE);
+	
 	gc   = gaim_conversation_get_gc(conv);
 	name = gaim_conversation_get_name(conv);
 
-	if (conv != NULL && gc != NULL && name != NULL) {
+	if (gc != NULL && name != NULL) {
 		gaim_conv_im_set_type_again(GAIM_CONV_IM(conv), TRUE);
 
 		serv_send_typing(gc, name, GAIM_TYPED);