Skip to content

VectorCraft: An open-source, vector art tool written by scratch in pure Rust

Reject non-digit array indexes in batch step references

NetterSilverbd96665f440c
diff --git a/crates/engine/src/steps.rs b/crates/engine/src/steps.rs
index b767aa4e9..78c16cc9b 100644
--- a/crates/engine/src/steps.rs
+++ b/crates/engine/src/steps.rs
@@ -111,6 +111,9 @@ fn parse(s: &str) -> Option<(Step, Vec<Seg>)> {
rest = r;
} else {
let (n, r) = rest.strip_prefix('[')?.split_once(']')?;
+ if n.is_empty() || !n.bytes().all(|b| b.is_ascii_digit()) {
+ return None;
+ }
path.push(Seg::Index(n.parse().ok()?));
rest = r;
}
@@ -161,6 +164,16 @@ mod tests {
assert!(e.contains("MB of values"), "{e}");
}
+ #[test]
+ fn array_index_must_be_plain_digits() {
+ let results = [json!({"ids": [5, 6]})];
+ assert_eq!(resolve(&json!("$0.ids[1]"), &results).unwrap(), json!(6));
+ for s in ["$0.ids[+1]", "$0.ids[]", "$0.ids[ 1]", "$0.ids[-1]"] {
+ let p = json!(s);
+ assert!(resolve(&p, &results).map_or(true, |v| v == p), "{s}");
+ }
+ }
+
#[test]
fn plain_strings_and_escapes_are_left_alone() {
let results = [json!({"id": 2})];