Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions src/builtins/units.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ fn parse(span: &Span, params: &[Ref<Expr>], args: &[Value], _strict: bool) -> Re
// a stable representation that includes an explicit leading digit.
let canonical_part = canonicalize_number_part(number_part);

if exponent_too_large(canonical_part.as_ref()) {
bail!(params[0].span().error("units.parse: exponent too large"));
}

if let Some(e) = ten_exp(suffix) {
let combined = combine_decimal_exponent(canonical_part.as_ref(), e)
.ok_or_else(|| params[0].span().error("could not parse number"))?;
Expand Down Expand Up @@ -169,6 +173,12 @@ fn parse_bytes(span: &Span, params: &[Ref<Expr>], args: &[Value], strict: bool)
// a stable representation that includes an explicit leading digit.
let canonical_part = canonicalize_number_part(number_part);

if exponent_too_large(canonical_part.as_ref()) {
bail!(params[0]
.span()
.error("units.parse_bytes: exponent too large"));
}

if let Some(e) = twob_exp(suffix) {
let mut number = match Number::from_str(canonical_part.as_ref()) {
Ok(n) => n,
Expand Down Expand Up @@ -245,3 +255,11 @@ fn split_decimal_exponent(number: &str) -> Option<(&str, i32)> {
let exponent = exp_part.parse::<i32>().ok()?;
Some((mantissa, exponent))
}

fn exponent_too_large(number: &str) -> bool {
number
.find(['e', 'E'])
.and_then(|idx| number.get(idx + 1..))
.map(|exponent| exponent.strip_prefix(['+', '-']).unwrap_or(exponent))
.is_some_and(|digits| digits.len() > 6)
}
30 changes: 30 additions & 0 deletions tests/interpreter/cases/builtins/units/exponent.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

cases:
- note: parse-exponent-too-large
data: {}
modules:
- |
package test
x = units.parse("1e9999999K")
query: data.test.x
error: "units.parse: exponent too large"

- note: parse-bytes-exponent-too-large
data: {}
modules:
- |
package test
x = units.parse_bytes("1e9999999Ki")
query: data.test.x
error: "units.parse_bytes: exponent too large"

- note: parse-normal-exponent-ok
data: {}
modules:
- |
package test
x = units.parse("1e6K")
query: data.test.x
want_result: 1e9
Loading