hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-24 08:15:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve representation of implicit varargs arrays to more reliably filter out known flow steps.

Browse Source
This commit is contained in:
Max Schaefer
2024-02-06 14:42:16 +00:00
parent 525f27173d
commit 02547d3839
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll
View File

@@ -35,14 +35,10 @@ newtype TApplicationModeEndpoint =
arg = DataFlow::getInstanceArgument(call) and
not call instanceof ConstructorCall
} or
TImplicitVarargsArray(Call call, DataFlow::Node arg, int idx) {
TImplicitVarargsArray(Call call, DataFlow::ImplicitVarargsArray arg, int idx) {
AutomodelJavaUtil::isFromSource(call) and
exists(Argument argExpr |
arg.asExpr() = argExpr and
call.getArgument(idx) = argExpr and
argExpr.isVararg() and
not exists(int i | i < idx and call.getArgument(i).(Argument).isVararg())
)
call = arg.getCall() and
idx = call.getCallee().getVaragsParameterIndex()
} or
TMethodReturnValue(Call call) {
AutomodelJavaUtil::isFromSource(call) and

7
java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java
View File

@@ -40,11 +40,12 @@ class Test {
); // $ sourceModelCandidate=newInputStream(Path,OpenOption[]):ReturnValue
}
public static InputStream getInputStream(String openPath) throws Exception {
public static InputStream getInputStream(String openPath, String otherPath) throws Exception {
return Test.getInputStream( // the call is not a source candidate (argument to local call)
Paths.get(
openPath // $ negativeSinkExample=get(String,String[]):Argument[0] // modeled as a flow step
) // $ sourceModelCandidate=get(String,String[]):ReturnValue
openPath, // $ negativeSinkExample=get(String,String[]):Argument[0] // modeled as a flow step
otherPath
) // $ sourceModelCandidate=get(String,String[]):ReturnValue negativeSinkExample=get(String,String[]):Argument[1]
);
}