comparison libpurple/protocols/oscar/flap_connection.c @ 22165:5421a1dc36f6

Track validity of flap_connections to prevent a crash when a disconnect is initiated via purple_timeout_add in flap_connection_schedule_destroy() and then is subsequently destroyed before the timeout is actually called.

22164:d1fe81e3a850

#endif

#ifdef _WIN32
#include "win32dep.h"
#endif

/**
 * This sends a channel 1 SNAC containing the FLAP version.
 * The FLAP version is sent by itself at the beginning of every
 * connection to a FLAP server.  It is always the very first

	conn->subtype = -1;
	conn->type = type;
	conn->queued_snacs = g_queue_new();

	od->oscar_connections = g_slist_prepend(od->oscar_connections, conn);

	return conn;
}

/**

	OscarData *od;
	PurpleAccount *account;
	aim_rxcallback_t userfunc;

	conn = data;
	od = conn->od;
	account = (PURPLE_CONNECTION_IS_VALID(od->gc) ? purple_connection_get_account(od->gc) : NULL);

	purple_debug_info("oscar", "Destroying oscar connection of "
			"type 0x%04hx.  Disconnect reason is %d\n",

	}
	g_queue_free(conn->queued_snacs);
	if (conn->queued_timeout > 0)
		purple_timeout_remove(conn->queued_timeout);

	g_free(conn);

	return FALSE;
}

22165:5421a1dc36f6

#endif

#ifdef _WIN32
#include "win32dep.h"
#endif

static GList *flap_connections = NULL;
#define PURPLE_FLAP_CONNECTION_IS_VALID(conn) (g_list_find(flap_connections, (conn)) != NULL)

/**
 * This sends a channel 1 SNAC containing the FLAP version.
 * The FLAP version is sent by itself at the beginning of every
 * connection to a FLAP server.  It is always the very first

	conn->subtype = -1;
	conn->type = type;
	conn->queued_snacs = g_queue_new();

	od->oscar_connections = g_slist_prepend(od->oscar_connections, conn);
	flap_connections = g_list_append(flap_connections, conn);

	return conn;
}

/**

	OscarData *od;
	PurpleAccount *account;
	aim_rxcallback_t userfunc;

	conn = data;
	
	if (!PURPLE_FLAP_CONNECTION_IS_VALID(conn))
		return FALSE;

	od = conn->od;
	account = (PURPLE_CONNECTION_IS_VALID(od->gc) ? purple_connection_get_account(od->gc) : NULL);

	purple_debug_info("oscar", "Destroying oscar connection of "
			"type 0x%04hx.  Disconnect reason is %d\n",

	}
	g_queue_free(conn->queued_snacs);
	if (conn->queued_timeout > 0)
		purple_timeout_remove(conn->queued_timeout);

	flap_connections = g_list_remove(flap_connections, conn);

	g_free(conn);

	return FALSE;
}