Make ObjC virtual functions return nil if they are called with nil, even if they are going to be skipped.
Reviewed By: jvillard Differential Revision: D3509645 fbshipit-source-id: 4835378master
parent
60c5b87ffd
commit
cf72de9460
@ -0,0 +1,49 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016 - 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/NSObject.h>
|
||||||
|
|
||||||
|
@interface A : NSObject {
|
||||||
|
int x;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (A*)get_a;
|
||||||
|
|
||||||
|
- (NSString*)skip_method;
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
||||||
|
@implementation A
|
||||||
|
|
||||||
|
- (A*)get_a {
|
||||||
|
return [A new];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (int)testOk:(A*)person {
|
||||||
|
A* personID = [person get_a];
|
||||||
|
NSString* lastRecord = [personID skip_method];
|
||||||
|
if (lastRecord) {
|
||||||
|
personID->x = 6;
|
||||||
|
return personID->x;
|
||||||
|
} else {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- (int)testBug:(A*)person {
|
||||||
|
A* personID = [person get_a];
|
||||||
|
NSString* lastRecord = [personID skip_method];
|
||||||
|
if (lastRecord) {
|
||||||
|
return 0;
|
||||||
|
} else {
|
||||||
|
return personID->x;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@end
|
@ -0,0 +1,63 @@
|
|||||||
|
/*
|
||||||
|
* 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.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 SkipMethodWithNilObjectTest {
|
||||||
|
|
||||||
|
public static final String FILE =
|
||||||
|
"infer/tests/codetoanalyze/objc/errors/npe/skip_method_with_nil_object.m";
|
||||||
|
|
||||||
|
private static ImmutableList<String> inferCmd;
|
||||||
|
|
||||||
|
public static final String PARAMETER_NOT_NULL_CHECKED = "PARAMETER_NOT_NULL_CHECKED";
|
||||||
|
|
||||||
|
@ClassRule
|
||||||
|
public static DebuggableTemporaryFolder folder =
|
||||||
|
new DebuggableTemporaryFolder();
|
||||||
|
|
||||||
|
@BeforeClass
|
||||||
|
public static void runInfer() throws InterruptedException, IOException {
|
||||||
|
inferCmd = InferRunner.createObjCInferCommandWithMLBuckets(
|
||||||
|
folder,
|
||||||
|
FILE,
|
||||||
|
"cf",
|
||||||
|
false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenInferRunsOnFBAudioInputCallbackSimpleThenPNNIsFound()
|
||||||
|
throws InterruptedException, IOException, InferException {
|
||||||
|
InferResults inferResults = InferRunner.runInferObjC(inferCmd);
|
||||||
|
String[] expectedProcedures = {"testBug:"};
|
||||||
|
assertThat(
|
||||||
|
"Results should contain " + PARAMETER_NOT_NULL_CHECKED, inferResults,
|
||||||
|
containsExactly(
|
||||||
|
PARAMETER_NOT_NULL_CHECKED,
|
||||||
|
FILE,
|
||||||
|
expectedProcedures));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in new issue