Summary: public Dictionary literals are normally implemented using `+dictionaryWithObjects:forKeys:count:` but were modeled as `+dictionaryWithObjectsAndKeys:` In particular, `@{@"aaa": nil}` would trigger a sentinel error instead of an NPE. This models dictionary literals as a special infer builtin that the backend interprets so as to give NPEs when passed nil objects or keys. Reviewed By: dulmarod Differential Revision: D2550039 fb-gh-sync-id: 1a10656master
parent
198c57aabc
commit
2af1687cd4
@ -0,0 +1,88 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2014 - present Facebook, Inc.
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* This source code is licensed under the BSD style license found in the
|
||||||
|
* LICENSE file in the root directory of this source tree. An additional grant
|
||||||
|
* of patent rights can be found in the PATENTS file in the same directory.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#import <Foundation/Foundation.h>
|
||||||
|
|
||||||
|
@interface A : NSObject {
|
||||||
|
|
||||||
|
}
|
||||||
|
@end
|
||||||
|
|
||||||
|
@implementation A
|
||||||
|
|
||||||
|
-(void) noProblem {
|
||||||
|
NSDictionary *foo = @{@"aaa":@"a value", @"bbb":@"b value"};
|
||||||
|
// check that dictionary literals create valid objects
|
||||||
|
NSArray *foofoo = @[foo];
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void) nilInDictionaryLiteralKey0 {
|
||||||
|
NSString *str = nil;
|
||||||
|
|
||||||
|
// nil argument in dictionary literal crashes
|
||||||
|
NSDictionary *foo = @{str: @"a value"};
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void) nilInDictionaryLiteralValue0 {
|
||||||
|
NSString *str = nil;
|
||||||
|
|
||||||
|
// nil argument in dictionary literal crashes
|
||||||
|
NSDictionary *foo = @{@"aaa": str};
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void) nilInDictionaryLiteralKey1 {
|
||||||
|
NSString *str = nil;
|
||||||
|
|
||||||
|
// nil argument in dictionary literal crashes
|
||||||
|
NSDictionary *foo = @{str: @"a value", @"bbb":@"b value"};
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void) nilInDictionaryLiteralValue1 {
|
||||||
|
NSString *str = nil;
|
||||||
|
|
||||||
|
// nil argument in dictionary literal crashes
|
||||||
|
NSDictionary *foo = @{@"aaa": str, @"bbb":@"b value"};
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void) nilInDictionaryLiteralKey2 {
|
||||||
|
NSString *str = nil;
|
||||||
|
|
||||||
|
// nil argument in dictionary literal crashes
|
||||||
|
NSDictionary *foo = @{@"aaa":@"a value", str:@"b value", @"ccc":@"c value"};
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void) nilInDictionaryLiteralValue2 {
|
||||||
|
NSString *str = nil;
|
||||||
|
|
||||||
|
// nil argument in dictionary literal crashes
|
||||||
|
NSDictionary *foo = @{@"aaa":@"a value", @"bbb":str, @"ccc":@"c value"};
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void) nilInDictionaryLiteralKey3 {
|
||||||
|
NSString *str = nil;
|
||||||
|
|
||||||
|
// nil argument in dictionary literal crashes
|
||||||
|
NSDictionary *foo = @{@"aaa":@"a value", @"bbb":@"b value", str:@"c value"};
|
||||||
|
}
|
||||||
|
|
||||||
|
-(void) nilInDictionaryLiteralValue3 {
|
||||||
|
NSString *str = nil;
|
||||||
|
|
||||||
|
// nil argument in dictionary literal crashes
|
||||||
|
NSDictionary *foo = @{@"aaa":@"a value", @"bbb":@"b value", @"ccc":str};
|
||||||
|
}
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
A *a = [A alloc];
|
||||||
|
[a noProblem];
|
||||||
|
[a nilInDictionaryLiteralKey0];
|
||||||
|
return 0;
|
||||||
|
}
|
@ -0,0 +1,79 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2013 - present Facebook, Inc.
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* This source code is licensed under the BSD style license found in the
|
||||||
|
* LICENSE file in the root directory of this source tree. An additional grant
|
||||||
|
* of patent rights can be found in the PATENTS file in the same directory.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package endtoend.objc;
|
||||||
|
|
||||||
|
import static org.hamcrest.MatcherAssert.assertThat;
|
||||||
|
import static utils.matchers.ResultContainsNoErrorInMethod.doesNotContain;
|
||||||
|
import static utils.matchers.ResultContainsExactly.containsExactly;
|
||||||
|
|
||||||
|
import com.google.common.collect.ImmutableList;
|
||||||
|
|
||||||
|
import org.junit.BeforeClass;
|
||||||
|
import org.junit.ClassRule;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
import utils.DebuggableTemporaryFolder;
|
||||||
|
import utils.InferException;
|
||||||
|
import utils.InferResults;
|
||||||
|
import utils.InferRunner;
|
||||||
|
|
||||||
|
public class NPEDictionaryLiteralTest {
|
||||||
|
|
||||||
|
public static final String PREMATURE_NIL_FILE =
|
||||||
|
"infer/tests/codetoanalyze/objc/errors/npe/nil_in_dictionary_literal.m";
|
||||||
|
|
||||||
|
private static ImmutableList<String> inferCmd;
|
||||||
|
|
||||||
|
public static final String NULL_DEREFERENCE = "NULL_DEREFERENCE";
|
||||||
|
|
||||||
|
@ClassRule
|
||||||
|
public static DebuggableTemporaryFolder folderNPD = new DebuggableTemporaryFolder();
|
||||||
|
|
||||||
|
@BeforeClass
|
||||||
|
public static void runInfer() throws InterruptedException, IOException {
|
||||||
|
inferCmd = InferRunner.createObjCInferCommandWithMLBuckets(
|
||||||
|
folderNPD,
|
||||||
|
PREMATURE_NIL_FILE,
|
||||||
|
"cf",
|
||||||
|
true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenInferRunsOnTestThenNoNPENotFound()
|
||||||
|
throws InterruptedException, IOException, InferException {
|
||||||
|
InferResults inferResults = InferRunner.runInferObjC(inferCmd);
|
||||||
|
|
||||||
|
assertThat(
|
||||||
|
"NPE should not be found", inferResults,
|
||||||
|
doesNotContain(
|
||||||
|
NULL_DEREFERENCE,
|
||||||
|
PREMATURE_NIL_FILE,
|
||||||
|
"no_problem"));
|
||||||
|
|
||||||
|
String[] expectedNPEProcedures = {
|
||||||
|
"nilInDictionaryLiteralKey0",
|
||||||
|
"nilInDictionaryLiteralKey1",
|
||||||
|
"nilInDictionaryLiteralKey2",
|
||||||
|
"nilInDictionaryLiteralKey3",
|
||||||
|
"nilInDictionaryLiteralValue0",
|
||||||
|
"nilInDictionaryLiteralValue1",
|
||||||
|
"nilInDictionaryLiteralValue2",
|
||||||
|
"nilInDictionaryLiteralValue3"
|
||||||
|
};
|
||||||
|
assertThat(
|
||||||
|
"Only NPE should be found", inferResults,
|
||||||
|
containsExactly(
|
||||||
|
NULL_DEREFERENCE,
|
||||||
|
PREMATURE_NIL_FILE,
|
||||||
|
expectedNPEProcedures));
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in new issue