adium.1-4: 2e027ee1: Fix a possible crash when receiving an u...

[thijsalkemade at gmail.com]

----------------------------------------------------------------------
Revision: 2e027ee15ef29e082eceea9ec99347cf8751ac4a
Parent:   e6091a5e70af187752dd370da0f20481ba18783e
Author:   thijsalkemade at gmail.com
Date:     03/07/12 07:30:02
Branch:   im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/2e027ee15ef29e082eceea9ec99347cf8751ac4a

Changelog: 

Fix a possible crash when receiving an unexpected message from the server on ICQ.

Refs #14983

Changes against parent e6091a5e70af187752dd370da0f20481ba18783e

  patched  libpurple/protocols/oscar/family_icq.c

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/family_icq.c	4de73e397aaf10ea54bdef718734f121f769f48e
+++ libpurple/protocols/oscar/family_icq.c	e0a656a1f6e6a188141114e5b250b2300b992aa5
@@ -91,7 +91,6 @@ int error(OscarData *od, aim_modsnac_t *
 
 	request_type = original_snac->data;
 	original_info_ptr = g_slist_find_custom(od->icq_info, &original_snac->id, compare_icq_infos);
-	original_info = original_info_ptr->data;
 
 	if (!original_info_ptr) {
 		purple_debug_misc("oscar", "icq: the request info for the error packet was not found");
@@ -99,6 +98,8 @@ int error(OscarData *od, aim_modsnac_t *
 		return 0;
 	}
 
+	original_info = original_info_ptr->data;
+
 	reason = byte_stream_get16(bs);
 	uin = g_strdup_printf("%u", original_info->uin);
 	switch (*request_type) {