comparison src/server.c @ 6578:1dc3eac729d1

[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: Tailor Script <[e-mail]>

6577:ea785d055825

	GaimConversation *c;
	struct buddy *b;
	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);

	if (signon && (GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->options &
				   OPT_PROTO_CORRECT_TIME)) {

	if (!b) {
		gaim_debug(GAIM_DEBUG_ERROR, "server", "No such buddy: %s\n", name);
		return;
	}

	/* 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... */
	if (strcmp(name, b->name)) {

6578:1dc3eac729d1

	GaimConversation *c;
	struct buddy *b;
	GSList *buddies;

	account = gaim_connection_get_account(gc);

	c = gaim_find_conversation(b->name);

	if (signon && (GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->options &
				   OPT_PROTO_CORRECT_TIME)) {

	if (!b) {
		gaim_debug(GAIM_DEBUG_ERROR, "server", "No such buddy: %s\n", name);
		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... */
	if (strcmp(name, b->name)) {