Browse files

Addresses memory leak and symbol clash from pull requests

Summary: Thanks for the pull requests calebshay and lludo

Test Plan: built, unit-test run

Reviewers: clang, chrisp, mmarucheck

Reviewed By: chrisp

CC: gregschechte, ekoneil

Differential Revision: https://phabricator.fb.com/D587973

Task ID: 1731992
  • Loading branch information...
1 parent 9aebe4c commit 95f1279d54f678fede0a74f2d2e2226b65116cc8 @onebit onebit committed Sep 28, 2012
Showing with 4 additions and 4 deletions.
  1. +1 −1 src/FBSession.m
  2. +1 −1 src/JSON/FBSBJsonBase.h
  3. +2 −2 src/JSON/FBSBJsonBase.m
View
2 src/FBSession.m
@@ -1657,7 +1657,7 @@ + (NSArray*)addBasicInfoPermission:(NSArray*)permissions {
}
}
- NSMutableArray *newPermissions = [[NSMutableArray alloc] initWithArray:permissions];
+ NSMutableArray *newPermissions = [NSMutableArray arrayWithArray:permissions];
[newPermissions addObject:@"email"];
return newPermissions;
}
View
2 src/JSON/FBSBJsonBase.h
@@ -29,7 +29,7 @@
#import <Foundation/Foundation.h>
-extern NSString * SBJSONErrorDomain;
+extern NSString * FBSBJSONErrorDomain;
enum {
View
4 src/JSON/FBSBJsonBase.m
@@ -28,7 +28,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
*/
#import "FBSBJsonBase.h"
-NSString * SBJSONErrorDomain = @"org.brautaset.JSON.ErrorDomain";
+NSString * FBSBJSONErrorDomain = @"org.brautaset.JSON.ErrorDomain";
@implementation FBSBJsonBase
@@ -61,7 +61,7 @@ - (void)addErrorWithCode:(NSUInteger)code description:(NSString*)str {
nil];
}
- NSError *error = [NSError errorWithDomain:SBJSONErrorDomain code:code userInfo:userInfo];
+ NSError *error = [NSError errorWithDomain:FBSBJSONErrorDomain code:code userInfo:userInfo];
[self willChangeValueForKey:@"errorTrace"];
[errorTrace addObject:error];

0 comments on commit 95f1279

Please sign in to comment.