[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.233.2.4,1.233.2.5 msgs.c,1.39,1.39.2.1 parse.c,1.25.2.4,1.25.2.5

[Stu T. <nos...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15032/src/protocols/irc

Modified Files:
      Tag: oldstatus
	irc.c msgs.c parse.c 
Log Message:
Some things here:
 - Several memory leak fixes
 - A few invalid memory access fixes
 - Fix MSN notification server transfer to be quiet about it
 - Fix MSN blist sync if user has insane friendly name
 - 1 typo fix :)

... and quite possibly something else I forgot.



Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.233.2.4
retrieving revision 1.233.2.5
diff -u -d -p -r1.233.2.4 -r1.233.2.5
--- irc.c	9 Jan 2005 16:36:08 -0000	1.233.2.4
+++ irc.c	11 Jan 2005 17:27:25 -0000	1.233.2.5
@@ -314,6 +314,7 @@ static void irc_close(GaimConnection *gc
 		gaim_timeout_remove(irc->timer);
 	g_hash_table_destroy(irc->cmds);
 	g_hash_table_destroy(irc->msgs);
+	g_hash_table_destroy(irc->buddies);
 	if (irc->motd)
 		g_string_free(irc->motd, TRUE);
 	g_free(irc->server);

Index: msgs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/msgs.c,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -d -p -r1.39 -r1.39.2.1
--- msgs.c	1 Sep 2004 01:07:39 -0000	1.39
+++ msgs.c	11 Jan 2005 17:27:25 -0000	1.39.2.1
@@ -224,6 +224,7 @@ void irc_msg_endwhois(struct irc_conn *i
 			   _("Buddy Information for %s"), irc->whois.nick);
 	gaim_notify_userinfo(gc, irc->whois.nick, NULL, buffer, NULL, str, NULL, NULL);
 
+	g_free(irc->whois.nick);
 	g_free(str);
 	memset(&irc->whois, 0, sizeof(irc->whois));
 }
@@ -738,6 +739,7 @@ void irc_msg_nickused(struct irc_conn *i
 	buf = irc_format(irc, "vn", "NICK", newnick);
 	irc_send(irc, buf);
 	g_free(buf);
+	g_free(newnick);
 }
 
 void irc_msg_notice(struct irc_conn *irc, const char *name, const char *from, char **args)

Index: parse.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/parse.c,v
retrieving revision 1.25.2.4
retrieving revision 1.25.2.5
diff -u -d -p -r1.25.2.4 -r1.25.2.5
--- parse.c	29 Nov 2004 04:35:18 -0000	1.25.2.4
+++ parse.c	11 Jan 2005 17:27:25 -0000	1.25.2.5
@@ -235,8 +235,10 @@ static char *irc_recv_convert(struct irc
 	enclist = gaim_account_get_string(irc->account, "encoding", IRC_DEFAULT_CHARSET);
 	encodings = g_strsplit(enclist, ",", -1);
 
-	if (encodings[0] == NULL)
+	if (encodings[0] == NULL) {
+		g_strfreev(encodings);
 		return gaim_utf8_salvage(string);
+	}
 
 	for (i = 0; encodings[i] != NULL; i++) {
 		charset = encodings[i];
@@ -255,6 +257,7 @@ static char *irc_recv_convert(struct irc
 			return utf8;
 		}
 	}
+	g_strfreev(encodings);
 
 	return gaim_utf8_salvage(string);
 }