diff options
| author | Aspen Smith <root@gws.fyi> | 2023-12-05T22·11-0500 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-12-05T23·12+0000 |
| commit | 8135a8d38cefdc4632b3c85fdbb663d067f91248 (patch) | |
| tree | 12506241f23e7071a49f4d03ea73b32d16d2afd3 /tvix/eval/src/builtins | |
| parent | 41235bf9086c6b048549c7564679d748c35e0de3 (diff) | |
fix(tvix/eval): Return error rather than panicking on bad substring r/7119
If builtins.substring is invoked with (byte!!) offsets that aren't at codepoint boundaries, return an error rather than panicking. This is still incorrect (see b/337) but pushes the incorrectness forward a step. Change-Id: I5a4261f2ff250874cd36489ef598dcf886669d04 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10199 Tested-by: BuildkiteCI Autosubmit: grfn <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'tvix/eval/src/builtins')
| -rw-r--r-- | tvix/eval/src/builtins/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index f9302deab84b..ead916377f94 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -951,7 +951,7 @@ mod pure_builtins { cmp::min(beg + (len as usize), x.as_str().len()) }; - Ok(Value::String(x.as_str()[beg..end].into())) + Ok(Value::String(x.as_bytes()[beg..end].try_into()?)) } #[builtin("tail")] |