Fixed leaks detected by static analyser.

umjames · Jun 24, 2010 · f9d6e5f · f9d6e5f
1 parent a2a5a00
commit f9d6e5f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/OADataFetcher.m b/OADataFetcher.m
@@ -55,7 +55,7 @@ - (void)connection:(NSURLConnection *)aConnection didFailWithError:(NSError *)er
 															  response:response
 																  data:responseData
 															didSucceed:NO];
-
+    [ticket autorelease];
 	[delegate performSelector:didFailSelector withObject:ticket withObject:error];
 }
 
@@ -68,7 +68,7 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection {
 															  response:response
 																  data:responseData
 															didSucceed:[(NSHTTPURLResponse *)response statusCode] < 400];
-
+    [ticket autorelease];
 	[delegate performSelector:didFinishSelector withObject:ticket withObject:responseData];
 }
 

diff --git a/OAMutableURLRequest.m b/OAMutableURLRequest.m
@@ -133,7 +133,7 @@ - (void)_generateTimestamp {
 - (void)_generateNonce {
     CFUUIDRef theUUID = CFUUIDCreate(NULL);
     CFStringRef string = CFUUIDCreateString(NULL, theUUID);
-    NSMakeCollectable(theUUID);
+    [NSMakeCollectable(theUUID) autorelease];
     nonce = (NSString *)string;
 }
 
@@ -144,11 +144,11 @@ - (NSString *)_signatureBaseString {
 	// 6 being the number of OAuth params in the Signature Base String
 	NSMutableArray *parameterPairs = [[NSMutableArray alloc] initWithCapacity:(5 + [[self parameters] count] + [tokenParameters count])];
 
-    [parameterPairs addObject:[[[OARequestParameter alloc] initWithName:@"oauth_consumer_key" value:consumer.key] URLEncodedNameValuePair]];
-    [parameterPairs addObject:[[[OARequestParameter alloc] initWithName:@"oauth_signature_method" value:[signatureProvider name]] URLEncodedNameValuePair]];
-    [parameterPairs addObject:[[[OARequestParameter alloc] initWithName:@"oauth_timestamp" value:timestamp] URLEncodedNameValuePair]];
-    [parameterPairs addObject:[[[OARequestParameter alloc] initWithName:@"oauth_nonce" value:nonce] URLEncodedNameValuePair]];
-    [parameterPairs addObject:[[[OARequestParameter alloc] initWithName:@"oauth_version" value:@"1.0"] URLEncodedNameValuePair]];
+    [parameterPairs addObject:[[[[OARequestParameter alloc] initWithName:@"oauth_consumer_key" value:consumer.key] autorelease] URLEncodedNameValuePair]];
+    [parameterPairs addObject:[[[[OARequestParameter alloc] initWithName:@"oauth_signature_method" value:[signatureProvider name]] autorelease] URLEncodedNameValuePair]];
+    [parameterPairs addObject:[[[[OARequestParameter alloc] initWithName:@"oauth_timestamp" value:timestamp] autorelease] URLEncodedNameValuePair]];
+    [parameterPairs addObject:[[[[OARequestParameter alloc] initWithName:@"oauth_nonce" value:nonce] autorelease] URLEncodedNameValuePair]];
+    [parameterPairs addObject:[[[[OARequestParameter alloc] initWithName:@"oauth_version" value:@"1.0"] autorelease] URLEncodedNameValuePair]];
 
 
 	for(NSString *k in tokenParameters) {
@@ -161,8 +161,9 @@ - (NSString *)_signatureBaseString {
 		}
 	}
 
-    NSArray *sortedPairs = [parameterPairs sortedArrayUsingSelector:@selector(compare:)];
-    NSString *normalizedRequestParameters = [sortedPairs componentsJoinedByString:@"&"];
+    [parameterPairs sortUsingSelector:@selector(compare:)];
+    NSString *normalizedRequestParameters = [parameterPairs componentsJoinedByString:@"&"];
+    [parameterPairs release];
 
 //	NSLog(@"Normalized: %@", normalizedRequestParameters);
     // OAuth Spec, Section 9.1.2 "Concatenate Request Elements"