Skip to content

Ruby: Simplify flow summary for fetch #8893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 27, 2022
Merged

Ruby: Simplify flow summary for fetch #8893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions ruby/ql/lib/codeql/ruby/frameworks/core/Array.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,19 +741,14 @@ module Array {

override predicate propagatesFlowExt(string input, string output, boolean preservesValue) {
(
input = "Argument[self].ArrayElement[?]" and
output = ["ReturnValue", "Argument[self].ArrayElement[?]"]
or
exists(ArrayIndex j | input = "Argument[self].ArrayElement[" + j + "]" |
j = i and output = "ReturnValue"
or
j != i and output = "Argument[self].ArrayElement[" + j + "]"
)
input = "Argument[self].ArrayElement[?," + i + "]" and
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, I didn't know we supported syntax like [?,0].

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's also a fairly recent addition thanks to @asgerf .

output = "ReturnValue"
or
input = "Argument[0]" and
output = "Argument[block].Parameter[0]"
or
input = "Argument[1]" and output = "ReturnValue"
input = "Argument[1]" and
output = "ReturnValue"
) and
preservesValue = true
}
Expand Down
46 changes: 0 additions & 46 deletions ruby/ql/test/library-tests/dataflow/array-flow/array-flow.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,18 +821,10 @@ edges
| array_flow.rb:466:19:466:30 | call to source : | array_flow.rb:471:9:471:9 | a [array element 3] : |
| array_flow.rb:466:19:466:30 | call to source : | array_flow.rb:473:9:473:9 | a [array element 3] : |
| array_flow.rb:466:19:466:30 | call to source : | array_flow.rb:473:9:473:9 | a [array element 3] : |
| array_flow.rb:466:19:466:30 | call to source : | array_flow.rb:475:9:475:9 | a [array element 3] : |
| array_flow.rb:466:19:466:30 | call to source : | array_flow.rb:475:9:475:9 | a [array element 3] : |
| array_flow.rb:466:19:466:30 | call to source : | array_flow.rb:477:9:477:9 | a [array element 3] : |
| array_flow.rb:466:19:466:30 | call to source : | array_flow.rb:477:9:477:9 | a [array element 3] : |
| array_flow.rb:466:33:466:44 | call to source : | array_flow.rb:467:9:467:9 | a [array element 4] : |
| array_flow.rb:466:33:466:44 | call to source : | array_flow.rb:467:9:467:9 | a [array element 4] : |
| array_flow.rb:466:33:466:44 | call to source : | array_flow.rb:471:9:471:9 | a [array element 4] : |
| array_flow.rb:466:33:466:44 | call to source : | array_flow.rb:471:9:471:9 | a [array element 4] : |
| array_flow.rb:466:33:466:44 | call to source : | array_flow.rb:473:9:473:9 | a [array element 4] : |
| array_flow.rb:466:33:466:44 | call to source : | array_flow.rb:473:9:473:9 | a [array element 4] : |
| array_flow.rb:466:33:466:44 | call to source : | array_flow.rb:475:9:475:9 | a [array element 4] : |
| array_flow.rb:466:33:466:44 | call to source : | array_flow.rb:475:9:475:9 | a [array element 4] : |
| array_flow.rb:466:33:466:44 | call to source : | array_flow.rb:477:9:477:9 | a [array element 4] : |
| array_flow.rb:466:33:466:44 | call to source : | array_flow.rb:477:9:477:9 | a [array element 4] : |
| array_flow.rb:467:9:467:9 | a [array element 3] : | array_flow.rb:467:9:469:7 | call to fetch : |
Expand All @@ -845,38 +837,16 @@ edges
| array_flow.rb:467:17:467:28 | call to source : | array_flow.rb:467:35:467:35 | x : |
| array_flow.rb:467:35:467:35 | x : | array_flow.rb:468:14:468:14 | x |
| array_flow.rb:467:35:467:35 | x : | array_flow.rb:468:14:468:14 | x |
| array_flow.rb:471:9:471:9 | [post] a [array element 4] : | array_flow.rb:473:9:473:9 | a [array element 4] : |
| array_flow.rb:471:9:471:9 | [post] a [array element 4] : | array_flow.rb:473:9:473:9 | a [array element 4] : |
| array_flow.rb:471:9:471:9 | [post] a [array element 4] : | array_flow.rb:475:9:475:9 | a [array element 4] : |
| array_flow.rb:471:9:471:9 | [post] a [array element 4] : | array_flow.rb:475:9:475:9 | a [array element 4] : |
| array_flow.rb:471:9:471:9 | [post] a [array element 4] : | array_flow.rb:477:9:477:9 | a [array element 4] : |
| array_flow.rb:471:9:471:9 | [post] a [array element 4] : | array_flow.rb:477:9:477:9 | a [array element 4] : |
| array_flow.rb:471:9:471:9 | a [array element 3] : | array_flow.rb:471:9:471:18 | call to fetch : |
| array_flow.rb:471:9:471:9 | a [array element 3] : | array_flow.rb:471:9:471:18 | call to fetch : |
| array_flow.rb:471:9:471:9 | a [array element 4] : | array_flow.rb:471:9:471:9 | [post] a [array element 4] : |
| array_flow.rb:471:9:471:9 | a [array element 4] : | array_flow.rb:471:9:471:9 | [post] a [array element 4] : |
| array_flow.rb:471:9:471:18 | call to fetch : | array_flow.rb:472:10:472:10 | b |
| array_flow.rb:471:9:471:18 | call to fetch : | array_flow.rb:472:10:472:10 | b |
| array_flow.rb:473:9:473:9 | [post] a [array element 4] : | array_flow.rb:475:9:475:9 | a [array element 4] : |
| array_flow.rb:473:9:473:9 | [post] a [array element 4] : | array_flow.rb:475:9:475:9 | a [array element 4] : |
| array_flow.rb:473:9:473:9 | [post] a [array element 4] : | array_flow.rb:477:9:477:9 | a [array element 4] : |
| array_flow.rb:473:9:473:9 | [post] a [array element 4] : | array_flow.rb:477:9:477:9 | a [array element 4] : |
| array_flow.rb:473:9:473:9 | a [array element 3] : | array_flow.rb:473:9:473:32 | call to fetch : |
| array_flow.rb:473:9:473:9 | a [array element 3] : | array_flow.rb:473:9:473:32 | call to fetch : |
| array_flow.rb:473:9:473:9 | a [array element 4] : | array_flow.rb:473:9:473:9 | [post] a [array element 4] : |
| array_flow.rb:473:9:473:9 | a [array element 4] : | array_flow.rb:473:9:473:9 | [post] a [array element 4] : |
| array_flow.rb:473:9:473:32 | call to fetch : | array_flow.rb:474:10:474:10 | b |
| array_flow.rb:473:9:473:32 | call to fetch : | array_flow.rb:474:10:474:10 | b |
| array_flow.rb:473:20:473:31 | call to source : | array_flow.rb:473:9:473:32 | call to fetch : |
| array_flow.rb:473:20:473:31 | call to source : | array_flow.rb:473:9:473:32 | call to fetch : |
| array_flow.rb:475:9:475:9 | [post] a [array element 3] : | array_flow.rb:477:9:477:9 | a [array element 3] : |
| array_flow.rb:475:9:475:9 | [post] a [array element 3] : | array_flow.rb:477:9:477:9 | a [array element 3] : |
| array_flow.rb:475:9:475:9 | [post] a [array element 4] : | array_flow.rb:477:9:477:9 | a [array element 4] : |
| array_flow.rb:475:9:475:9 | [post] a [array element 4] : | array_flow.rb:477:9:477:9 | a [array element 4] : |
| array_flow.rb:475:9:475:9 | a [array element 3] : | array_flow.rb:475:9:475:9 | [post] a [array element 3] : |
| array_flow.rb:475:9:475:9 | a [array element 3] : | array_flow.rb:475:9:475:9 | [post] a [array element 3] : |
| array_flow.rb:475:9:475:9 | a [array element 4] : | array_flow.rb:475:9:475:9 | [post] a [array element 4] : |
| array_flow.rb:475:9:475:9 | a [array element 4] : | array_flow.rb:475:9:475:9 | [post] a [array element 4] : |
| array_flow.rb:475:9:475:34 | call to fetch : | array_flow.rb:476:10:476:10 | b |
| array_flow.rb:475:9:475:34 | call to fetch : | array_flow.rb:476:10:476:10 | b |
| array_flow.rb:475:22:475:33 | call to source : | array_flow.rb:475:9:475:34 | call to fetch : |
Expand Down Expand Up @@ -4346,36 +4316,20 @@ nodes
| array_flow.rb:468:14:468:14 | x | semmle.label | x |
| array_flow.rb:470:10:470:10 | b | semmle.label | b |
| array_flow.rb:470:10:470:10 | b | semmle.label | b |
| array_flow.rb:471:9:471:9 | [post] a [array element 4] : | semmle.label | [post] a [array element 4] : |
| array_flow.rb:471:9:471:9 | [post] a [array element 4] : | semmle.label | [post] a [array element 4] : |
| array_flow.rb:471:9:471:9 | a [array element 3] : | semmle.label | a [array element 3] : |
| array_flow.rb:471:9:471:9 | a [array element 3] : | semmle.label | a [array element 3] : |
| array_flow.rb:471:9:471:9 | a [array element 4] : | semmle.label | a [array element 4] : |
| array_flow.rb:471:9:471:9 | a [array element 4] : | semmle.label | a [array element 4] : |
| array_flow.rb:471:9:471:18 | call to fetch : | semmle.label | call to fetch : |
| array_flow.rb:471:9:471:18 | call to fetch : | semmle.label | call to fetch : |
| array_flow.rb:472:10:472:10 | b | semmle.label | b |
| array_flow.rb:472:10:472:10 | b | semmle.label | b |
| array_flow.rb:473:9:473:9 | [post] a [array element 4] : | semmle.label | [post] a [array element 4] : |
| array_flow.rb:473:9:473:9 | [post] a [array element 4] : | semmle.label | [post] a [array element 4] : |
| array_flow.rb:473:9:473:9 | a [array element 3] : | semmle.label | a [array element 3] : |
| array_flow.rb:473:9:473:9 | a [array element 3] : | semmle.label | a [array element 3] : |
| array_flow.rb:473:9:473:9 | a [array element 4] : | semmle.label | a [array element 4] : |
| array_flow.rb:473:9:473:9 | a [array element 4] : | semmle.label | a [array element 4] : |
| array_flow.rb:473:9:473:32 | call to fetch : | semmle.label | call to fetch : |
| array_flow.rb:473:9:473:32 | call to fetch : | semmle.label | call to fetch : |
| array_flow.rb:473:20:473:31 | call to source : | semmle.label | call to source : |
| array_flow.rb:473:20:473:31 | call to source : | semmle.label | call to source : |
| array_flow.rb:474:10:474:10 | b | semmle.label | b |
| array_flow.rb:474:10:474:10 | b | semmle.label | b |
| array_flow.rb:475:9:475:9 | [post] a [array element 3] : | semmle.label | [post] a [array element 3] : |
| array_flow.rb:475:9:475:9 | [post] a [array element 3] : | semmle.label | [post] a [array element 3] : |
| array_flow.rb:475:9:475:9 | [post] a [array element 4] : | semmle.label | [post] a [array element 4] : |
| array_flow.rb:475:9:475:9 | [post] a [array element 4] : | semmle.label | [post] a [array element 4] : |
| array_flow.rb:475:9:475:9 | a [array element 3] : | semmle.label | a [array element 3] : |
| array_flow.rb:475:9:475:9 | a [array element 3] : | semmle.label | a [array element 3] : |
| array_flow.rb:475:9:475:9 | a [array element 4] : | semmle.label | a [array element 4] : |
| array_flow.rb:475:9:475:9 | a [array element 4] : | semmle.label | a [array element 4] : |
| array_flow.rb:475:9:475:34 | call to fetch : | semmle.label | call to fetch : |
| array_flow.rb:475:9:475:34 | call to fetch : | semmle.label | call to fetch : |
| array_flow.rb:475:22:475:33 | call to source : | semmle.label | call to source : |
Expand Down