# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 991977116 0
# Node ID db1b719c66cf0b7b41a6699530fc473776c412bb
# Parent  1bd70305b227a41d1877bc090ffe3ea7192eceb1
[gaim-migrate @ 1984]
No more crashy on confirm accoiunt.

committer: Tailor Script <tailor@pidgin.im>

diff -r 1bd70305b227 -r db1b719c66cf ChangeLog
--- a/ChangeLog	Thu Jun 07 21:50:03 2001 +0000
+++ b/ChangeLog	Fri Jun 08 05:11:56 2001 +0000
@@ -1,5 +1,9 @@
 GAIM: The Pimpin' Penguin IM Clone thats good for the soul! 
 
+version 0.11.0-pre14:
+	* Fixed a segfault with Oscar's account confirmation
+	  (Thanks, Adam)
+
 version 0.11.0-pre13 (06/06/2001):
 	* Can view/set chat topic in Jabber (thanks faceprint)
 	* The napster plugin no longer segfaults on invalid names
diff -r 1bd70305b227 -r db1b719c66cf src/oscar.c
--- a/src/oscar.c	Thu Jun 07 21:50:03 2001 +0000
+++ b/src/oscar.c	Fri Jun 08 05:11:56 2001 +0000
@@ -344,11 +344,20 @@
 				GdkInputCondition condition) {
 	struct aim_conn_t *conn = (struct aim_conn_t *)data;
 	struct gaim_connection *gc = find_gaim_conn_by_oscar_conn(conn);
-	struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
+	struct oscar_data *odata;
+
+	if (!gc) {
+	  /* gc is null. we return, else we seg SIGSEG on next line. */
+	  debug_printf("oscar callback for closed connection (1).\n");
+	  return;
+	}
+      
+	odata = (struct oscar_data *)gc->proto_data;
+
 	if (!g_slist_find(connections, gc)) {
-		/* oh boy. this is probably bad. i guess the only thing we can really do
-		 * is return? */
-		debug_printf("oscar callback for closed connection.\n");
+		/* oh boy. this is probably bad. i guess the only thing we 
+		 * can really do is return? */
+		debug_printf("oscar callback for closed connection (2).\n");
 		return;
 	}