[Gaim-commits] SF.net SVN: gaim: [16116] trunk/src/conversation.c

[<rl...@us...>]

Revision: 16116
Author:   rlaager
Date:     2006-05-01 13:43:46 -0700 (Mon, 01 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16116&view=rev

Log Message:
-----------
Resolve CID 133
Description: Pointer "conv" dereferenced before NULL check

Modified Paths:
--------------
    trunk/src/conversation.c
Modified: trunk/src/conversation.c
===================================================================
--- trunk/src/conversation.c	2006-05-01 20:37:37 UTC (rev 16115)
+++ trunk/src/conversation.c	2006-05-01 20:43:46 UTC (rev 16116)
@@ -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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.