Skip to content

Commit be96647

Browse files
authored
Merge pull request github#6256 from hvitved/dataflow/summary-node-type-join-order
Data flow: Fix bad join-orders in `summaryNodeType`
2 parents 61ee4af + 47d126e commit be96647

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

csharp/ql/src/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,9 @@ module Private {
375375
or
376376
exists(ReturnKind rk |
377377
head = TReturnSummaryComponent(rk) and
378-
result = getCallbackReturnType(getNodeType(summaryNodeInputState(c, s.drop(1))), rk)
378+
result =
379+
getCallbackReturnType(getNodeType(summaryNodeInputState(pragma[only_bind_out](c),
380+
s.drop(1))), rk)
379381
)
380382
)
381383
or
@@ -392,7 +394,9 @@ module Private {
392394
)
393395
or
394396
exists(int i | head = TParameterSummaryComponent(i) |
395-
result = getCallbackParameterType(getNodeType(summaryNodeOutputState(c, s.drop(1))), i)
397+
result =
398+
getCallbackParameterType(getNodeType(summaryNodeOutputState(pragma[only_bind_out](c),
399+
s.drop(1))), i)
396400
)
397401
)
398402
)

java/ql/src/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,9 @@ module Private {
375375
or
376376
exists(ReturnKind rk |
377377
head = TReturnSummaryComponent(rk) and
378-
result = getCallbackReturnType(getNodeType(summaryNodeInputState(c, s.drop(1))), rk)
378+
result =
379+
getCallbackReturnType(getNodeType(summaryNodeInputState(pragma[only_bind_out](c),
380+
s.drop(1))), rk)
379381
)
380382
)
381383
or
@@ -392,7 +394,9 @@ module Private {
392394
)
393395
or
394396
exists(int i | head = TParameterSummaryComponent(i) |
395-
result = getCallbackParameterType(getNodeType(summaryNodeOutputState(c, s.drop(1))), i)
397+
result =
398+
getCallbackParameterType(getNodeType(summaryNodeOutputState(pragma[only_bind_out](c),
399+
s.drop(1))), i)
396400
)
397401
)
398402
)

0 commit comments

Comments
 (0)