[gaim-migrate @ 7100]

Sat, 23 Aug 2003 00:23:51 +0000

author
Robert McQueen <robot101@debian.org>
date
Sat, 23 Aug 2003 00:23:51 +0000
changeset 6578
18f9b5d33e65
parent 6577
fdc4eb5decdc
child 6579
08abb0d1f944

[gaim-migrate @ 7100]
(20:21:09) Robot101: someone remove line 1097 and 1098 of server.c, and put the c = gaim_find_conversation two blocks down, after the existing (!b) conditional.
(20:21:20) LSchiere: what does that do?
(20:22:04) Robot101: fixes the null buddy dereferencing bug without duplicated check for (!b)
(20:22:21) LSchiere: what null buddy dereferencing bug?
(20:22:35) ***LSchiere goes to find the code in question
(20:22:39) Robot101: the one faceprint fixed on Thursday
(20:22:44) LSchiere: ah
(20:22:47) Robot101: by adding a check that was already there a few lines down

committer: Luke Schierer <lschiere@pidgin.im>

src/server.c file | annotate | diff | comparison | revisions
--- a/src/server.c	Fri Aug 22 21:09:38 2003 +0000
+++ b/src/server.c	Sat Aug 23 00:23:51 2003 +0000
@@ -1092,10 +1092,6 @@
 	GSList *buddies;
 
 	account = gaim_connection_get_account(gc);
-	b = gaim_find_buddy(account, name);
-
-	if(!b) /* This shouldn't happen, but apparently does */
-		return;
 
 	c = gaim_find_conversation(b->name);
 
@@ -1118,6 +1114,8 @@
 		return;
 	}
 
+	b = gaim_find_buddy(account, name);
+
 	/* This code will 'align' the name from the TOC */
 	/* server with what's in our record.  We want to */
 	/* store things how THEY want it... */

mercurial