From d54d330601956b813b7adb916b254cb4ce168880 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 21 Oct 2026 12:04:44 +1100 Subject: [PATCH] base: let parse_number_xxx return "arg too long" Updates PR #184 --- internal/cgen/base/floatconv-submodule-code.c | 6 +++++ internal/cgen/base/intconv-submodule.c | 7 ++++++ internal/cgen/base/strconv-public.h | 8 +++++++ lang/builtin/builtin.go | 1 + release/c/wuffs-unsupported-snapshot.c | 23 +++++++++++++++++++ 5 files changed, 45 insertions(+) diff --git a/internal/cgen/base/floatconv-submodule-code.c b/internal/cgen/base/floatconv-submodule-code.c index 97144ff2..4b293f36 100644 --- a/internal/cgen/base/floatconv-submodule-code.c +++ b/internal/cgen/base/floatconv-submodule-code.c @@ -1481,6 +1481,12 @@ wuffs_base__parse_number_f64(wuffs_base__slice_u8 s, uint32_t options) { // As the pointer p walks the contents, it's faster to repeatedly check "is // *p a valid digit" than "is p within bounds and *p a valid digit". if (s.len >= 256) { + if (s.len > WUFFS_BASE__PARSE_NUMBER_XXX__SLICE_LEN_MAX_INCL) { + wuffs_base__result_f64 ret; + ret.status.repr = wuffs_base__error__bad_argument_length_too_long; + ret.value = 0; + return ret; + } goto fallback; } uint8_t z[256]; diff --git a/internal/cgen/base/intconv-submodule.c b/internal/cgen/base/intconv-submodule.c index 8508d381..98fa00d6 100644 --- a/internal/cgen/base/intconv-submodule.c +++ b/internal/cgen/base/intconv-submodule.c @@ -174,6 +174,13 @@ fail_out_of_bounds: WUFFS_BASE__MAYBE_STATIC wuffs_base__result_u64 // wuffs_base__parse_number_u64(wuffs_base__slice_u8 s, uint32_t options) { + if (s.len > WUFFS_BASE__PARSE_NUMBER_XXX__SLICE_LEN_MAX_INCL) { + wuffs_base__result_u64 ret; + ret.status.repr = wuffs_base__error__bad_argument_length_too_long; + ret.value = 0; + return ret; + } + uint8_t* p = s.ptr; uint8_t* q = s.ptr + s.len; diff --git a/internal/cgen/base/strconv-public.h b/internal/cgen/base/strconv-public.h index f559b171..673f3c21 100644 --- a/internal/cgen/base/strconv-public.h +++ b/internal/cgen/base/strconv-public.h @@ -10,6 +10,14 @@ // ---------------- String Conversions +// WUFFS_BASE__PARSE_NUMBER_XXX__SLICE_LEN_MAX_INCL is the largest acceptible +// length for the wuffs_base__parse_number_xxx functions' slice argument. +// +// It equals ((1 << 20) - 1), which is one less than 1 MiB. +#define WUFFS_BASE__PARSE_NUMBER_XXX__SLICE_LEN_MAX_INCL 0xFFFFF + +// -------- + // Options (bitwise or'ed together) for wuffs_base__parse_number_xxx // functions. The XXX options apply to both integer and floating point. The FXX // options apply only to floating point. diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index a47645f3..4cb8b81a 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -289,6 +289,7 @@ var Statuses = [...]string{ // Errors. `"#bad I/O position"`, + `"#bad argument (length too long)"`, `"#bad argument (length too short)"`, `"#bad argument"`, `"#bad call sequence"`, diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index a47dc39c..71f03dee 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -594,6 +594,7 @@ extern const char wuffs_base__suspension__short_read[]; extern const char wuffs_base__suspension__short_workbuf[]; extern const char wuffs_base__suspension__short_write[]; extern const char wuffs_base__error__bad_i_o_position[]; +extern const char wuffs_base__error__bad_argument_length_too_long[]; extern const char wuffs_base__error__bad_argument_length_too_short[]; extern const char wuffs_base__error__bad_argument[]; extern const char wuffs_base__error__bad_call_sequence[]; @@ -6478,6 +6479,14 @@ wuffs_base__pixel_swizzler::swizzle_interleaved_from_slice( // ---------------- String Conversions +// WUFFS_BASE__PARSE_NUMBER_XXX__SLICE_LEN_MAX_INCL is the largest acceptible +// length for the wuffs_base__parse_number_xxx functions' slice argument. +// +// It equals ((1 << 20) - 1), which is one less than 1 MiB. +#define WUFFS_BASE__PARSE_NUMBER_XXX__SLICE_LEN_MAX_INCL 0xFFFFF + +// -------- + // Options (bitwise or'ed together) for wuffs_base__parse_number_xxx // functions. The XXX options apply to both integer and floating point. The FXX // options apply only to floating point. @@ -19506,6 +19515,7 @@ const char wuffs_base__suspension__short_read[] = "$base: short read"; const char wuffs_base__suspension__short_workbuf[] = "$base: short workbuf"; const char wuffs_base__suspension__short_write[] = "$base: short write"; const char wuffs_base__error__bad_i_o_position[] = "#base: bad I/O position"; +const char wuffs_base__error__bad_argument_length_too_long[] = "#base: bad argument (length too long)"; const char wuffs_base__error__bad_argument_length_too_short[] = "#base: bad argument (length too short)"; const char wuffs_base__error__bad_argument[] = "#base: bad argument"; const char wuffs_base__error__bad_call_sequence[] = "#base: bad call sequence"; @@ -22881,6 +22891,12 @@ wuffs_base__parse_number_f64(wuffs_base__slice_u8 s, uint32_t options) { // As the pointer p walks the contents, it's faster to repeatedly check "is // *p a valid digit" than "is p within bounds and *p a valid digit". if (s.len >= 256) { + if (s.len > WUFFS_BASE__PARSE_NUMBER_XXX__SLICE_LEN_MAX_INCL) { + wuffs_base__result_f64 ret; + ret.status.repr = wuffs_base__error__bad_argument_length_too_long; + ret.value = 0; + return ret; + } goto fallback; } uint8_t z[256]; @@ -23541,6 +23557,13 @@ fail_out_of_bounds: WUFFS_BASE__MAYBE_STATIC wuffs_base__result_u64 // wuffs_base__parse_number_u64(wuffs_base__slice_u8 s, uint32_t options) { + if (s.len > WUFFS_BASE__PARSE_NUMBER_XXX__SLICE_LEN_MAX_INCL) { + wuffs_base__result_u64 ret; + ret.status.repr = wuffs_base__error__bad_argument_length_too_long; + ret.value = 0; + return ret; + } + uint8_t* p = s.ptr; uint8_t* q = s.ptr + s.len;