changeset 13712:43ebbe768a43

[gaim-migrate @ 16116] Resolve CID 133 Description: Pointer "conv" dereferenced before NULL check committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Mon, 01 May 2006 20:43:46 +0000
parents 967ef719cb62
children 2cf94cdb2e99
files src/conversation.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);