Resolved illegal use of nullable values in command line targets

Added checks for `nil` before using values, then cast the values to `__nonnull` pointers. Closes nolanw#49.
ChatSecure · Nov 25, 2015 · 64683f7 · 64683f7
1 parent b7d71c9
commit 64683f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Utilities/Benchmarker.m b/Utilities/Benchmarker.m
@@ -43,7 +43,8 @@ int main(void) { @autoreleasepool {
     }
 
     if ([arguments containsObject:@"selector"]) {
-        HTMLDocument *selectorsDocument = [HTMLDocument documentWithString:[NSString stringWithContentsOfFile:PathForFixture(@"query-selector.html") usedEncoding:nil error:nil]];
+        NSString * const HTMLString = [NSString stringWithContentsOfFile:PathForFixture(@"query-selector.html") usedEncoding:nil error:nil];
+        HTMLDocument *selectorsDocument = (HTMLString) ? [HTMLDocument documentWithString:(NSString * __nonnull)HTMLString] : nil;
         NSArray *selectorSuites = [NSArray arrayWithContentsOfFile:PathForFixture(@"query-selector.plist")];
         NSUInteger reps = 5;
         NSTimeInterval selectorTime = Time(reps, ^{

diff --git a/Utilities/EntityFetcher.m b/Utilities/EntityFetcher.m
@@ -55,8 +55,9 @@ static inline BOOL is_universal(unsigned int c)
 
 int main(void) { @autoreleasepool
 {
-    static NSString * const EntitiesURL = @"http://www.whatwg.org/specs/web-apps/current-work/multipage/entities.json";
-    NSData *data = [NSData dataWithContentsOfURL:[NSURL URLWithString:EntitiesURL]];
+    static NSString * const EntitiesURLString = @"http://www.whatwg.org/specs/web-apps/current-work/multipage/entities.json";
+    NSURL * const EntitiesURL = [NSURL URLWithString:EntitiesURLString];
+    NSData *data = (EntitiesURL) ? [NSData dataWithContentsOfURL:(NSURL * __nonnull)EntitiesURL] : nil;
     if (!data) {
         NSLog(@"could not download entities JSON from %@", EntitiesURL);
         return 1;