Skip to content

Commit 12a1fdd

Browse files
committed
Rust: Add data flow test for early Err return
1 parent 339e991 commit 12a1fdd

3 files changed

Lines changed: 21 additions & 11 deletions

File tree

‎rust/ql/test/library-tests/dataflow/global/inline-flow.expected‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,14 @@ edges
235235
| main.rs:433:32:433:43 | STATIC_VALUE | main.rs:433:17:433:28 | static_value | provenance | |
236236
| main.rs:436:13:436:24 | STATIC_VALUE | main.rs:427:5:427:46 | static STATIC_VALUE | provenance | |
237237
| main.rs:436:28:436:37 | source(...) | main.rs:436:13:436:24 | STATIC_VALUE | provenance | |
238-
| main.rs:466:55:469:5 | { ... } [Ok] | main.rs:473:14:473:39 | unwrapped_value_returned(...) [Ok] | provenance | |
238+
| main.rs:466:55:469:5 | { ... } [Ok] | main.rs:478:14:478:39 | unwrapped_value_returned(...) [Ok] | provenance | |
239239
| main.rs:467:13:467:13 | a [Ok, Ok] | main.rs:468:9:468:9 | a [Ok, Ok] | provenance | |
240240
| main.rs:467:48:467:65 | Ok(...) [Ok, Ok] | main.rs:467:13:467:13 | a [Ok, Ok] | provenance | |
241241
| main.rs:467:51:467:64 | Ok(...) [Ok] | main.rs:467:48:467:65 | Ok(...) [Ok, Ok] | provenance | |
242242
| main.rs:467:54:467:63 | source(...) | main.rs:467:51:467:64 | Ok(...) [Ok] | provenance | |
243243
| main.rs:468:9:468:9 | a [Ok, Ok] | main.rs:468:9:468:10 | TryExpr [Ok] | provenance | |
244244
| main.rs:468:9:468:10 | TryExpr [Ok] | main.rs:466:55:469:5 | { ... } [Ok] | provenance | |
245-
| main.rs:473:14:473:39 | unwrapped_value_returned(...) [Ok] | main.rs:473:14:473:48 | ... .unwrap() | provenance | MaD:3 |
245+
| main.rs:478:14:478:39 | unwrapped_value_returned(...) [Ok] | main.rs:478:14:478:48 | ... .unwrap() | provenance | MaD:3 |
246246
nodes
247247
| main.rs:12:28:14:1 | { ... } | semmle.label | { ... } |
248248
| main.rs:13:5:13:13 | source(...) | semmle.label | source(...) |
@@ -506,8 +506,8 @@ nodes
506506
| main.rs:467:54:467:63 | source(...) | semmle.label | source(...) |
507507
| main.rs:468:9:468:9 | a [Ok, Ok] | semmle.label | a [Ok, Ok] |
508508
| main.rs:468:9:468:10 | TryExpr [Ok] | semmle.label | TryExpr [Ok] |
509-
| main.rs:473:14:473:39 | unwrapped_value_returned(...) [Ok] | semmle.label | unwrapped_value_returned(...) [Ok] |
510-
| main.rs:473:14:473:48 | ... .unwrap() | semmle.label | ... .unwrap() |
509+
| main.rs:478:14:478:39 | unwrapped_value_returned(...) [Ok] | semmle.label | unwrapped_value_returned(...) [Ok] |
510+
| main.rs:478:14:478:48 | ... .unwrap() | semmle.label | ... .unwrap() |
511511
subpaths
512512
| main.rs:38:16:38:24 | source(...) | main.rs:26:28:26:33 | ...: i64 | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | main.rs:38:5:38:5 | [post] a [MyStruct] |
513513
| main.rs:39:10:39:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:30:31:32:5 | { ... } | main.rs:39:10:39:21 | a.get_data() |
@@ -575,4 +575,4 @@ testFailures
575575
| main.rs:434:18:434:29 | static_value | main.rs:436:28:436:37 | source(...) | main.rs:434:18:434:29 | static_value | $@ | main.rs:436:28:436:37 | source(...) | source(...) |
576576
| main.rs:437:18:437:29 | STATIC_VALUE | main.rs:427:36:427:45 | source(...) | main.rs:437:18:437:29 | STATIC_VALUE | $@ | main.rs:427:36:427:45 | source(...) | source(...) |
577577
| main.rs:437:18:437:29 | STATIC_VALUE | main.rs:436:28:436:37 | source(...) | main.rs:437:18:437:29 | STATIC_VALUE | $@ | main.rs:436:28:436:37 | source(...) | source(...) |
578-
| main.rs:473:14:473:48 | ... .unwrap() | main.rs:467:54:467:63 | source(...) | main.rs:473:14:473:48 | ... .unwrap() | $@ | main.rs:467:54:467:63 | source(...) | source(...) |
578+
| main.rs:478:14:478:48 | ... .unwrap() | main.rs:467:54:467:63 | source(...) | main.rs:478:14:478:48 | ... .unwrap() | $@ | main.rs:467:54:467:63 | source(...) | source(...) |

‎rust/ql/test/library-tests/dataflow/global/main.rs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,14 @@ mod try_operator {
468468
a?
469469
}
470470

471+
fn err_returned() -> Result<bool, i64> {
472+
let err = Err(source(52))?;
473+
Ok(true)
474+
}
475+
471476
fn test_try_operator() {
472477
sink(unwrapped_value_not_returned().unwrap());
473478
sink(unwrapped_value_returned().unwrap()); // $ hasValueFlow=51
479+
sink(err_returned().unwrap_err()); // $ MISSING: hasValueFlow=52
474480
}
475481
}

‎rust/ql/test/library-tests/dataflow/global/viableCallable.expected‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,13 @@
147147
| main.rs:455:5:455:22 | test_async_await(...) | main.rs:353:1:358:1 | fn test_async_await |
148148
| main.rs:462:23:462:32 | source(...) | main.rs:1:1:3:1 | fn source |
149149
| main.rs:467:54:467:63 | source(...) | main.rs:1:1:3:1 | fn source |
150-
| main.rs:472:9:472:53 | sink(...) | main.rs:5:1:7:1 | fn sink |
151-
| main.rs:472:14:472:43 | unwrapped_value_not_returned(...) | main.rs:461:5:464:5 | fn unwrapped_value_not_returned |
152-
| main.rs:472:14:472:52 | ... .unwrap() | {EXTERNAL LOCATION} | [summarized] fn unwrap |
153-
| main.rs:473:9:473:49 | sink(...) | main.rs:5:1:7:1 | fn sink |
154-
| main.rs:473:14:473:39 | unwrapped_value_returned(...) | main.rs:466:5:469:5 | fn unwrapped_value_returned |
155-
| main.rs:473:14:473:48 | ... .unwrap() | {EXTERNAL LOCATION} | [summarized] fn unwrap |
150+
| main.rs:472:23:472:32 | source(...) | main.rs:1:1:3:1 | fn source |
151+
| main.rs:477:9:477:53 | sink(...) | main.rs:5:1:7:1 | fn sink |
152+
| main.rs:477:14:477:43 | unwrapped_value_not_returned(...) | main.rs:461:5:464:5 | fn unwrapped_value_not_returned |
153+
| main.rs:477:14:477:52 | ... .unwrap() | {EXTERNAL LOCATION} | [summarized] fn unwrap |
154+
| main.rs:478:9:478:49 | sink(...) | main.rs:5:1:7:1 | fn sink |
155+
| main.rs:478:14:478:39 | unwrapped_value_returned(...) | main.rs:466:5:469:5 | fn unwrapped_value_returned |
156+
| main.rs:478:14:478:48 | ... .unwrap() | {EXTERNAL LOCATION} | [summarized] fn unwrap |
157+
| main.rs:479:9:479:41 | sink(...) | main.rs:5:1:7:1 | fn sink |
158+
| main.rs:479:14:479:27 | err_returned(...) | main.rs:471:5:474:5 | fn err_returned |
159+
| main.rs:479:14:479:40 | ... .unwrap_err() | {EXTERNAL LOCATION} | [summarized] fn unwrap_err |

0 commit comments

Comments
 (0)