Rust: Test direct calls to std::fmt::format and alloc::fmt::format.

Author: geoffw0

rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected

@@ -39,6 +39,8 @@ edges
 | main.rs:65:16:65:16 | s | main.rs:65:16:65:25 | s.as_str() | provenance | MaD:6 |
 | main.rs:69:9:69:9 | s | main.rs:71:34:71:61 | MacroExpr | provenance |  |
 | main.rs:69:9:69:9 | s | main.rs:74:34:74:59 | MacroExpr | provenance |  |
+| main.rs:69:9:69:9 | s | main.rs:81:39:81:64 | MacroExpr | provenance |  |
+| main.rs:69:9:69:9 | s | main.rs:84:41:84:66 | MacroExpr | provenance |  |
 | main.rs:69:13:69:22 | source(...) | main.rs:69:9:69:9 | s | provenance |  |
 | main.rs:71:9:71:18 | formatted1 | main.rs:72:10:72:19 | formatted1 | provenance |  |
 | main.rs:71:22:71:62 | ...::format(...) | main.rs:71:9:71:18 | formatted1 | provenance |  |
@@ -51,6 +53,12 @@ edges
 | main.rs:78:9:78:18 | formatted3 | main.rs:79:10:79:19 | formatted3 | provenance |  |
 | main.rs:78:22:78:75 | ...::format(...) | main.rs:78:9:78:18 | formatted3 | provenance |  |
 | main.rs:78:34:78:74 | MacroExpr | main.rs:78:22:78:75 | ...::format(...) | provenance | MaD:7 |
+| main.rs:81:9:81:18 | formatted4 | main.rs:82:10:82:19 | formatted4 | provenance |  |
+| main.rs:81:22:81:65 | ...::format(...) | main.rs:81:9:81:18 | formatted4 | provenance |  |
+| main.rs:81:39:81:64 | MacroExpr | main.rs:81:22:81:65 | ...::format(...) | provenance | MaD:7 |
+| main.rs:84:9:84:18 | formatted5 | main.rs:85:10:85:19 | formatted5 | provenance |  |
+| main.rs:84:22:84:67 | ...::format(...) | main.rs:84:9:84:18 | formatted5 | provenance |  |
+| main.rs:84:41:84:66 | MacroExpr | main.rs:84:22:84:67 | ...::format(...) | provenance | MaD:7 |
 | main.rs:89:9:89:10 | s1 | main.rs:93:18:93:25 | MacroExpr | provenance |  |
 | main.rs:89:9:89:10 | s1 | main.rs:94:18:94:32 | MacroExpr | provenance |  |
 | main.rs:89:14:89:23 | source(...) | main.rs:89:9:89:10 | s1 | provenance |  |
@@ -113,6 +121,14 @@ nodes
 | main.rs:78:22:78:75 | ...::format(...) | semmle.label | ...::format(...) |
 | main.rs:78:34:78:74 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:79:10:79:19 | formatted3 | semmle.label | formatted3 |
+| main.rs:81:9:81:18 | formatted4 | semmle.label | formatted4 |
+| main.rs:81:22:81:65 | ...::format(...) | semmle.label | ...::format(...) |
+| main.rs:81:39:81:64 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:82:10:82:19 | formatted4 | semmle.label | formatted4 |
+| main.rs:84:9:84:18 | formatted5 | semmle.label | formatted5 |
+| main.rs:84:22:84:67 | ...::format(...) | semmle.label | ...::format(...) |
+| main.rs:84:41:84:66 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:85:10:85:19 | formatted5 | semmle.label | formatted5 |
 | main.rs:89:9:89:10 | s1 | semmle.label | s1 |
 | main.rs:89:14:89:23 | source(...) | semmle.label | source(...) |
 | main.rs:93:10:93:26 | MacroExpr | semmle.label | MacroExpr |
@@ -137,5 +153,7 @@ testFailures
 | main.rs:72:10:72:19 | formatted1 | main.rs:69:13:69:22 | source(...) | main.rs:72:10:72:19 | formatted1 | $@ | main.rs:69:13:69:22 | source(...) | source(...) |
 | main.rs:75:10:75:19 | formatted2 | main.rs:69:13:69:22 | source(...) | main.rs:75:10:75:19 | formatted2 | $@ | main.rs:69:13:69:22 | source(...) | source(...) |
 | main.rs:79:10:79:19 | formatted3 | main.rs:77:17:77:32 | source_usize(...) | main.rs:79:10:79:19 | formatted3 | $@ | main.rs:77:17:77:32 | source_usize(...) | source_usize(...) |
+| main.rs:82:10:82:19 | formatted4 | main.rs:69:13:69:22 | source(...) | main.rs:82:10:82:19 | formatted4 | $@ | main.rs:69:13:69:22 | source(...) | source(...) |
+| main.rs:85:10:85:19 | formatted5 | main.rs:69:13:69:22 | source(...) | main.rs:85:10:85:19 | formatted5 | $@ | main.rs:69:13:69:22 | source(...) | source(...) |
 | main.rs:93:10:93:26 | MacroExpr | main.rs:89:14:89:23 | source(...) | main.rs:93:10:93:26 | MacroExpr | $@ | main.rs:89:14:89:23 | source(...) | source(...) |
 | main.rs:94:10:94:33 | MacroExpr | main.rs:89:14:89:23 | source(...) | main.rs:94:10:94:33 | MacroExpr | $@ | main.rs:89:14:89:23 | source(...) | source(...) |

rust/ql/test/library-tests/dataflow/strings/main.rs

@@ -1,5 +1,5 @@
 use std::fmt;
-
+extern crate alloc;
 
 // Taint tests for strings
 
@@ -78,11 +78,11 @@ fn format_args_built_in() {
     let formatted3 = fmt::format(format_args!("Hello {:width$}!", "World"));
     sink(formatted3); // $ hasTaintFlow=10
 
+    let formatted4 = std::fmt::format(format_args!("Hello {s}!"));
+    sink(formatted4); // $ hasTaintFlow=88
 
-
-
-
-
+    let formatted5 = alloc::fmt::format(format_args!("Hello {s}!"));
+    sink(formatted5); // $ hasTaintFlow=88
 }
 
 fn format_macro() {