gaim/gaim

Backport this from head.
oldstatus
2004-12-23, Mark Doliner
1b8208f2b6a4
Parents 91cebde0905d
Children 55fd101ce220
Backport this from head.
--- a/src/protocols/oscar/oscar.c Thu Dec 23 15:13:38 2004 -0500
+++ b/src/protocols/oscar/oscar.c Thu Dec 23 20:15:02 2004 -0500
@@ -1928,9 +1928,16 @@
static void oscar_xfer_init_recv(GaimXfer *xfer)
{
- struct aim_oft_info *oft_info = xfer->data;
- GaimConnection *gc = oft_info->sess->aux_data;
- OscarData *od = gc->proto_data;
+ struct aim_oft_info *oft_info;
+ GaimConnection *gc;
+ OscarData *od;
+
+ g_return_if_fail(xfer != NULL);
+ g_return_if_fail(xfer->data != NULL);
+
+ oft_info = xfer->data;
+ gc = oft_info->sess->aux_data;
+ od = gc->proto_data;
gaim_debug_info("oscar", "AAA - in oscar_xfer_recv_init\n");