adium 5907:8d8b6a5165f2: Don't use this function for base64 deco...

commits at adium.im commits at adium.im
Wed Apr 1 13:29:25 UTC 2015


details:	http://hg.adium.im/adium/rev/8d8b6a5165f2
revision:	5907:8d8b6a5165f2
branch:		GoogleOAuth2
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Wed Apr 01 15:29:11 2015 +0200

Don't use this function for base64 decoding, it is 10.9+ only

diffs (31 lines):

diff -r 8fc11ca97010 -r 8d8b6a5165f2 Plugins/Purple Service/AIPurpleGTalkAccount.m
--- a/Plugins/Purple Service/AIPurpleGTalkAccount.m	Wed Apr 01 15:15:17 2015 +0200
+++ b/Plugins/Purple Service/AIPurpleGTalkAccount.m	Wed Apr 01 15:29:11 2015 +0200
@@ -24,6 +24,8 @@
 
 #import <Adium/AIAccountControllerProtocol.h>
 
+#import "NSData+Base64.h"
+
 @implementation AIPurpleGTalkAccount
 
 - (const char *)purpleAccountName
@@ -223,7 +225,7 @@
 					}
 				}
 				
-				NSData *identityData = [[NSData alloc] initWithBase64EncodedString:base64EncodedIdentity options:NSDataBase64DecodingIgnoreUnknownCharacters];
+				NSData *identityData = [NSData dataFromBase64String:base64EncodedIdentity];
 				NSDictionary *identity = [identityData objectFromJSONData];
 				
 				AILogWithSignature(@"%@", identity);
@@ -254,6 +256,9 @@
 	[password release];
 	password = [[responseDict objectForKey:@"access_token"] retain];
 	
+	[conn release]; conn = nil;
+	[response release]; response = nil;
+	
 	[self setGTalkMechEnabled:YES];
 	[super connect];
 }




More information about the commits mailing list