Merge branch 'master' of github.com:rentzsch/OAuthConsumer

rentzsch · Aug 12, 2010 · 7ee2a48 · 7ee2a48
2 parents 6999d44 + 4daa38a
commit 7ee2a48
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,12 @@
+# xcode noise
+build
+*.pbxuser
+*.mode1v3
+*.mode2v3
+*.perspectivev3
+
+# osx noise
+.DS_Store
+profile
+
+Graphics
diff --git a/Crypto/Base64Transcoder.c b/Crypto/Base64Transcoder.c
@@ -145,7 +145,7 @@ if (theRemainingBytes == 1)
 	if (theOutIndex % 74 == 72)
 		{
 		outOutputData[theOutIndex++] = '\r';
-		outOutputData[theOutIndex++] = '\n';
+		outOutputData[theOutIndex] = '\n';
 		}
 	}
 else if (theRemainingBytes == 2)
@@ -157,7 +157,7 @@ else if (theRemainingBytes == 2)
 	if (theOutIndex % 74 == 72)
 		{
 		outOutputData[theOutIndex++] = '\r';
-		outOutputData[theOutIndex++] = '\n';
+		outOutputData[theOutIndex] = '\n';
 		}
 	}
 return(true);

diff --git a/NSMutableURLRequest+Parameters.m b/NSMutableURLRequest+Parameters.m
@@ -43,7 +43,13 @@ - (NSArray *)parameters
     }
 
     if ((encodedParameters == nil) || ([encodedParameters isEqualToString:@""]))
-        return nil;
+	{
+		if (shouldfree) 
+		{
+			[encodedParameters release];
+		}
+		return nil;
+	}
 
     NSArray *encodedParameterPairs = [encodedParameters componentsSeparatedByString:@"&"];
     NSMutableArray *requestParameters = [[NSMutableArray alloc] initWithCapacity:16];

diff --git a/NSString+URLEncoding.m b/NSString+URLEncoding.m
@@ -30,21 +30,21 @@ @implementation NSString (OAURLEncodingAdditions)
 
 - (NSString *)URLEncodedString 
 {
-    NSString *result = (NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault,
+    NSString *result = (NSString *)NSMakeCollectable(CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault,
                                                                            (CFStringRef)self,
                                                                            NULL,
 																		   CFSTR("!*'();:@&=+$,/?%#[]"),
-                                                                           kCFStringEncodingUTF8);
+                                                                           kCFStringEncodingUTF8));
     [result autorelease];
 	return result;
 }
 
 - (NSString*)URLDecodedString
 {
-	NSString *result = (NSString *)CFURLCreateStringByReplacingPercentEscapesUsingEncoding(kCFAllocatorDefault,
+	NSString *result = (NSString *)NSMakeCollectable(CFURLCreateStringByReplacingPercentEscapesUsingEncoding(kCFAllocatorDefault,
 																						   (CFStringRef)self,
 																						   CFSTR(""),
-																						   kCFStringEncodingUTF8);
+																						   kCFStringEncodingUTF8));
     [result autorelease];
 	return result;	
 }

diff --git a/OADataFetcher.h b/OADataFetcher.h
@@ -32,7 +32,6 @@
 @private
     OAMutableURLRequest *request;
     NSHTTPURLResponse *response;
-    NSURLConnection *connection;
     NSError *error;
     NSData *responseData;
     id delegate;

diff --git a/OADataFetcher.m b/OADataFetcher.m
@@ -52,13 +52,15 @@ - (void)fetchDataWithRequest:(OAMutableURLRequest *)aRequest
         [delegate performSelector:didFailSelector
                        withObject:ticket
                        withObject:error];
+		[ticket release];
     } else {
         OAServiceTicket *ticket = [[OAServiceTicket alloc] initWithRequest:request
                                                                   response:response
                                                                 didSucceed:[(NSHTTPURLResponse *)response statusCode] < 400];
         [delegate performSelector:didFinishSelector
                        withObject:ticket
                        withObject:responseData];
+		[ticket release];
     }   
 }
 

diff --git a/OAMutableURLRequest.m b/OAMutableURLRequest.m
@@ -206,7 +206,7 @@ - (void)_generateNonce
 {
     CFUUIDRef theUUID = CFUUIDCreate(NULL);
     CFStringRef string = CFUUIDCreateString(NULL, theUUID);
-    NSMakeCollectable(theUUID);
+		CFRelease(theUUID);
     nonce = (NSString *)string;
 }