Skip to content

Rust: Add flow through ? operator #18163

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 4 commits into from
Dec 4, 2024
Merged

Rust: Add flow through ? operator #18163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b50834a
Rust: Add data flow tests for question mark operator
paldepind Nov 29, 2024
70c6086
Rust: Model `?` as reading from `Option` and `Result`
paldepind Nov 29, 2024
7092f13
Merge branch 'main' into rust-df-try-expr
paldepind Dec 4, 2024
ed6f873
Merge branch 'main' into rust-df-try-expr
paldepind Dec 4, 2024
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
10 changes: 9 additions & 1 deletion rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,6 +884,13 @@ module RustDataFlow implements InputSig<Location> {
node1.asExpr() = access.getExpr() and
node2.asExpr() = access
)
or
exists(TryExprCfgNode try |
node1.asExpr() = try.getExpr() and
node2.asExpr() = try and
c.(VariantPositionContent).getVariantCanonicalPath(0).getExtendedCanonicalPath() =
["crate::option::Option::Some", "crate::result::Result::Ok"]
)
)
or
FlowSummaryImpl::Private::Steps::summaryReadStep(node1.(Node::FlowSummaryNode).getSummaryNode(),
Expand Down Expand Up @@ -1065,7 +1072,8 @@ private module Cached {
TSourceParameterNode(ParamBaseCfgNode p) or
TPatNode(PatCfgNode p) or
TExprPostUpdateNode(ExprCfgNode e) {
isArgumentForCall(e, _, _) or e = any(FieldExprCfgNode access).getExpr()
isArgumentForCall(e, _, _) or
e = [any(FieldExprCfgNode access).getExpr(), any(TryExprCfgNode try).getExpr()]
} or
TSsaNode(SsaImpl::DataFlowIntegration::SsaNode node) or
TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn)
Expand Down
Loading
Loading