pidgin-commits

[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.

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

[<the...@us...>]

Revision: 16320
Author:   thekingant
Date:     2006-06-23 09:59:12 -0700 (Fri, 23 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16320&view=rev

Log Message:
-----------
sf patch #1511450, from Wan Hing Wah
Fix a segfault when catching certain signals because
the wrong parameters were passed to those signals.
My bad.

Modified Paths:
--------------
    trunk/src/conversation.c
Modified: trunk/src/conversation.c
===================================================================
--- trunk/src/conversation.c	2006-06-23 16:02:36 UTC (rev 16319)
+++ trunk/src/conversation.c	2006-06-23 16:59:12 UTC (rev 16320)
@@ -58,7 +58,7 @@
 	gaim_conv_im_stop_typing_timeout(im);
 
 	gaim_signal_emit(gaim_conversations_get_handle(),
-					 "buddy-typing-stopped", c);
+					 "buddy-typing-stopped", c->account, c->name);
 
 	return FALSE;
 }
@@ -83,7 +83,7 @@
 
 		serv_send_typing(gc, name, GAIM_TYPED);
 		gaim_signal_emit(gaim_conversations_get_handle(),
-						 "buddy-typed", conv);
+						 "buddy-typed", conv->account, conv->name);
 
 		gaim_debug(GAIM_DEBUG_MISC, "conversation", "typed...\n");
 	}


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

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

[<aar...@us...>]

Revision: 16582
Author:   aaronsheldon
Date:     2006-07-26 19:20:33 -0700 (Wed, 26 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16582&view=rev

Log Message:
-----------
Memory leak plug

Modified Paths:
--------------
    trunk/src/conversation.c
Modified: trunk/src/conversation.c
===================================================================
--- trunk/src/conversation.c	2006-07-26 06:42:59 UTC (rev 16581)
+++ trunk/src/conversation.c	2006-07-27 02:20:33 UTC (rev 16582)
@@ -1952,8 +1952,12 @@
 {
 	g_return_if_fail(cb != NULL);
 
+	g_free(cb->alias);
+	g_free(cb->alias_key);
 	g_free(cb->name);
 	cb->name = NULL;
+	cb->alias = NULL;
+	cb->alias_key = NULL;
 	cb->flags = 0;
 
 	GAIM_DBUS_UNREGISTER_POINTER(cb);


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