comparison libpurple/protocols/oscar/peer.c @ 27680:4e1eef14b095

Add some debugging for a file transfer crash. Refs #4829. The crash is happening because something in inner_tlvlist in aim_im_sendch2_sendfile_requestdirect is NULL, which then causes aim_tlvlist_write to call byte_stream_putraw on a NULL pointer (length is greater than 0, so aim_tlvlist_write assumes there is something there). I don't see *why*, but I think this will "fix" it.

27679:0ec880685f5f

		purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL));
		g_free(tmp);
	}
	else if (conn->type == OSCAR_CAPABILITY_SENDFILE)
	{
		aim_im_sendch2_sendfile_requestdirect(od,
				conn->cookie, conn->bn,
				purple_network_ip_atoi(listener_ip),
				listener_port, ++conn->lastrequestnumber,
				(const gchar *)conn->xferdata.name,
				conn->xferdata.size, conn->xferdata.totfiles);
	}
}

27680:4e1eef14b095

		purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL));
		g_free(tmp);
	}
	else if (conn->type == OSCAR_CAPABILITY_SENDFILE)
	{
		const guchar *ip_atoi = purple_network_ip_atoi(listener_ip);
		if (ip_atoi == NULL) {
			purple_debug_error("oscar", "Cannot send file. IP %s failed atoi.\n"
					"Other possibly useful information: fd = %d, port = %d\n",
			                   listener_ip ? listener_ip : "(null!)", conn->listenerfd,
							   listener_port);
			purple_xfer_cancel_local(conn->xfer);
			return;
		}
		aim_im_sendch2_sendfile_requestdirect(od,
				conn->cookie, conn->bn,
				ip_atoi,
				listener_port, ++conn->lastrequestnumber,
				(const gchar *)conn->xferdata.name,
				conn->xferdata.size, conn->xferdata.totfiles);
	}
}