Merge pull request #187 from AzureAD/dev

Fix leaking timers and other memory issues

Author: Brandon Werner

ADALiOS/ADALiOS/ADAuthenticationWebViewController.m

@@ -163,6 +163,10 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)
 
 - (void)webViewDidStartLoad:(UIWebView *)webView
 {
+    
+    if (timer != nil){
+        [timer invalidate];
+    }
 #pragma unused(webView)
     timer = [NSTimer scheduledTimerWithTimeInterval:_timeout target:self selector:@selector(failWithTimeout) userInfo:nil repeats:NO];
 }
@@ -171,13 +175,15 @@ - (void)webViewDidFinishLoad:(UIWebView *)webView
 {
 #pragma unused(webView)
     [timer invalidate];
+    timer = nil;
 }
 
 - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error
 {
 #pragma unused(webView)
     if(timer && [timer isValid]){
         [timer invalidate];
+        timer = nil;
     }
 
     if (NSURLErrorCancelled == error.code)

ADALiOS/ADALiOS/ADWorkPlaceJoinUtil.m

@@ -111,7 +111,7 @@ - (ADRegistrationInformation*)getRegistrationInformation: (NSString*) sharedAcce
     {
         AD_LOG_VERBOSE(@"Found identity in keychain", nil);
         //Get the certificate and data
-        status = SecIdentityCopyCertificate(identity, &certificate);
+        SecIdentityCopyCertificate(identity, &certificate);
         if(certificate)
         {
             AD_LOG_VERBOSE(@"Found certificate in keychain", nil);
@@ -230,6 +230,10 @@ - (NSData *)base64DataFromString: (NSString *)string
         return [NSData data];
     }
 
+    for (int i = 0; i < BASE64QUANTUMREP; i++) {
+        accumulated[i] = 0;
+    }
+    
     charString = (const unsigned char *)[string UTF8String];
 
     theData = [NSMutableData dataWithCapacity: [string length]];