[Gaim-commits] SF.net SVN: gaim: [16050] trunk/src/protocols/bonjour

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

Revision: 16050
Author:   thekingant
Date:     2006-04-17 16:53:40 -0700 (Mon, 17 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16050&view=rev

Log Message:
-----------
This should fix Coverity CID 49: buddy was sometimes
leaking in _resolve_reply() in src/protocols/bonjour/dns_sd.c

Modified Paths:
--------------
    trunk/src/protocols/bonjour/buddy.c
    trunk/src/protocols/bonjour/buddy.h
    trunk/src/protocols/bonjour/dns_sd.c
Modified: trunk/src/protocols/bonjour/buddy.c
===================================================================
--- trunk/src/protocols/bonjour/buddy.c	2006-04-17 19:28:15 UTC (rev 16049)
+++ trunk/src/protocols/bonjour/buddy.c	2006-04-17 23:53:40 UTC (rev 16050)
@@ -27,9 +27,10 @@
  * Creates a new buddy.
  */
 BonjourBuddy *
-bonjour_buddy_new(gchar *name, gchar *first, gint port_p2pj,
-	gchar *phsh, gchar *status, gchar *email, gchar *last, gchar *jid, gchar *AIM,
-	gchar *vc, gchar *ip, gchar *msg)
+bonjour_buddy_new(const gchar *name, const gchar *first, gint port_p2pj,
+	const gchar *phsh, const gchar *status, const gchar *email,
+	const gchar *last, const gchar *jid, const gchar *AIM,
+	const gchar *vc, const gchar *ip, const gchar *msg)
 {
 	BonjourBuddy *buddy = malloc(sizeof(BonjourBuddy));
 

Modified: trunk/src/protocols/bonjour/buddy.h
===================================================================
--- trunk/src/protocols/bonjour/buddy.h	2006-04-17 19:28:15 UTC (rev 16049)
+++ trunk/src/protocols/bonjour/buddy.h	2006-04-17 23:53:40 UTC (rev 16050)
@@ -43,9 +43,10 @@
 /**
  * Creates a new buddy.
  */
-BonjourBuddy *bonjour_buddy_new(gchar *name, gchar *first, gint port_p2pj,
-	gchar *phsh, gchar *status, gchar *email, gchar *last, gchar *jid, gchar *AIM,
-	gchar *vc, gchar *ip, gchar *msg);
+BonjourBuddy *bonjour_buddy_new(const gchar *name, const gchar *first,
+	gint port_p2pj, const gchar *phsh, const gchar *status,
+	const gchar *email, const gchar *last, const gchar *jid,
+	const gchar *AIM, const gchar *vc, const gchar *ip, const gchar *msg);
 
 /**
  * Check if all the compulsory buddy data is present.

Modified: trunk/src/protocols/bonjour/dns_sd.c
===================================================================
--- trunk/src/protocols/bonjour/dns_sd.c	2006-04-17 19:28:15 UTC (rev 16049)
+++ trunk/src/protocols/bonjour/dns_sd.c	2006-04-17 23:53:40 UTC (rev 16050)
@@ -143,11 +143,12 @@
 
 	/* Put the parameters of the text_record in a buddy and add the buddy to */
 	/* the buddy list */
-	buddy = bonjour_buddy_new((gchar *)name, first, port_p2pj, phsh,
+	buddy = bonjour_buddy_new(name, first, port_p2pj, phsh,
 							  status, email, last, jid, AIM, vc, ip, msg);
 
 	if (bonjour_buddy_check(buddy) == FALSE)
 	{
+		bonjour_buddy_delete(buddy);
 		return SW_DISCOVERY_E_UNKNOWN;
 	}
 


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