pidgin.2.x.y: 09d2e29b: Fixes #14983

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 09d2e29b6ff4dcc675099f74645ca2eb119ad6b5
Parent:   90fa151abc22265213ed484f5c93cbe132776126
Author:   markdoliner at pidgin.im
Date:     03/10/12 00:25:00
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/09d2e29b6ff4dcc675099f74645ca2eb119ad6b5

Changelog: 

Fixes #14983


*** Plucked rev 2e027ee15ef29e082eceea9ec99347cf8751ac4a (thijsalkemade at gmail.com):
Fix a possible crash when receiving an unexpected message from the server on ICQ.

Refs #14983

Changes against parent 90fa151abc22265213ed484f5c93cbe132776126

  patched  ChangeLog
  patched  libpurple/protocols/oscar/family_icq.c

-------------- next part --------------
============================================================
--- ChangeLog	31d9c10707c7e4d320ee2744c563ee1cfd5ac36a
+++ ChangeLog	cddc9c2da4e53cbc6fc1e29a28dcb0d58cc9c9eb
@@ -16,6 +16,8 @@ version 2.10.2 (02/22/2012):
 	  (Dan Williams) (#13859)
 
 	AIM and ICQ:
+	* Fix a possible crash when receiving an unexpected message
+	  from the server. (Thijs Alkemade) (#14983)
 	* Allow signing on with usernames containing periods and
 	  underscores. (#13500)
 	* Allow adding buddies containing periods and underscores. (#13500)
============================================================
--- 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) {