hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-20 18:56:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
Tom Hvitved
2021-06-04 14:29:53 +02:00
parent cc02c95092
commit 42202402a4
5 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
csharp/ql/src/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
View File

@@ -712,8 +712,8 @@ module Private {
exists(SourceOrSinkElement e |
sourceElement(e, output, kind) and
if outputNeedsReference(specLast(output))
then viableCallable(ref.asCall()) = any(InterpretNode n | n.asElement() = e).asCallable()
else ref.asElement() = e
then e = ref.getCallTarget()
else e = ref.asElement()
)
}
@@ -721,8 +721,8 @@ module Private {
exists(SourceOrSinkElement e |
sinkElement(e, input, kind) and
if inputNeedsReference(specLast(input))
then viableCallable(ref.asCall()) = any(InterpretNode n | n.asElement() = e).asCallable()
else ref.asElement() = e
then e = ref.getCallTarget()
else e = ref.asElement()
)
}

3
csharp/ql/src/semmle/code/csharp/dataflow/internal/FlowSummaryImplSpecific.qll
View File

@@ -136,6 +136,9 @@ class InterpretNode extends TInterpretNode {
/** Gets the callable that this node corresponds to, if any. */
DataFlowCallable asCallable() { result = this.asElement() }
/** Gets the target of this call, if any. */
Callable getCallTarget() { result = this.asCall().getARuntimeTarget() }
/** Gets a textual representation of this node. */
string toString() {
result = this.asElement().toString()

10
java/ql/src/semmle/code/java/dataflow/internal/DataFlowDispatch.qll
View File

@@ -4,21 +4,13 @@ private import DataFlowUtil
private import semmle.code.java.dataflow.InstanceAccess
private import semmle.code.java.dataflow.FlowSummary
private import semmle.code.java.dispatch.VirtualDispatch as VirtualDispatch
private import semmle.code.java.dataflow.internal.FlowSummaryImplSpecific
private module DispatchImpl {
/** Gets a viable implementation of the target of the given `Call`. */
Callable viableCallable(Call c) {
result = VirtualDispatch::viableCallable(c)
or
result = c.getCallee().getSourceDeclaration() and
(
result instanceof SummarizedCallable
or
sourceElement(result, _, _)
or
sinkElement(result, _, _)
)
result.(SummarizedCallable) = c.getCallee().getSourceDeclaration()
}
/**

8
java/ql/src/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
View File

@@ -712,8 +712,8 @@ module Private {
exists(SourceOrSinkElement e |
sourceElement(e, output, kind) and
if outputNeedsReference(specLast(output))
then viableCallable(ref.asCall()) = any(InterpretNode n | n.asElement() = e).asCallable()
else ref.asElement() = e
then e = ref.getCallTarget()
else e = ref.asElement()
)
}
@@ -721,8 +721,8 @@ module Private {
exists(SourceOrSinkElement e |
sinkElement(e, input, kind) and
if inputNeedsReference(specLast(input))
then viableCallable(ref.asCall()) = any(InterpretNode n | n.asElement() = e).asCallable()
else ref.asElement() = e
then e = ref.getCallTarget()
else e = ref.asElement()
)
}

3
java/ql/src/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll
View File

@@ -125,6 +125,9 @@ class InterpretNode extends TInterpretNode {
/** Gets the callable that this node corresponds to, if any. */
DataFlowCallable asCallable() { result = this.asElement() }
/** Gets the target of this call, if any. */
Callable getCallTarget() { result = this.asCall().getCallee().getSourceDeclaration() }
/** Gets a textual representation of this node. */
string toString() {
result = this.asElement().toString()