From 035433e913872bc9c99fb19cd5b2eec1463ccdec Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Thu, 31 Aug 2023 13:40:46 +0200 Subject: Document decimal integer parsing helpers, add an octal variant Signed-off-by: David Oberhollenzer --- lib/util/src/parse_int.c | 36 +++++++++++++++++++++++++----------- lib/util/test/parse_int.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/util/src/parse_int.c b/lib/util/src/parse_int.c index 1bca528..18e5b9a 100644 --- a/lib/util/src/parse_int.c +++ b/lib/util/src/parse_int.c @@ -11,8 +11,8 @@ #include -int parse_uint(const char *in, size_t len, size_t *diff, - sqfs_u64 vmin, sqfs_u64 vmax, sqfs_u64 *out) +static int parse(const char *in, size_t len, size_t *diff, + sqfs_u64 base, sqfs_u64 vmin, sqfs_u64 vmax, sqfs_u64 *out) { /* init result */ if (diff != NULL) @@ -25,25 +25,28 @@ int parse_uint(const char *in, size_t len, size_t *diff, /* parse sequence */ while (len > 0 && isdigit(*in)) { - sqfs_u64 x = *(in++) - '0'; - --len; + sqfs_u64 x = *in - '0'; + if (x >= base) + break; - if (diff != NULL) - ++(*diff); - - if ((*out) >= (0xFFFFFFFFFFFFFFFFULL / 10ULL)) + if ((*out) >= (0xFFFFFFFFFFFFFFFFULL / base)) return SQFS_ERROR_OVERFLOW; - (*out) *= 10; + (*out) *= base; if ((*out) > (0xFFFFFFFFFFFFFFFFULL - x)) return SQFS_ERROR_OVERFLOW; (*out) += x; + + --len; + ++in; + if (diff != NULL) + ++(*diff); } /* range check */ - if ((vmin != vmax) && ((*out < vmin) || (*out > vmax))) + if ((vmin < vmax) && ((*out < vmin) || (*out > vmax))) return SQFS_ERROR_OUT_OF_BOUNDS; /* if diff is not used, entire must have been processed */ @@ -53,6 +56,17 @@ int parse_uint(const char *in, size_t len, size_t *diff, return 0; } +int parse_uint(const char *in, size_t len, size_t *diff, + sqfs_u64 vmin, sqfs_u64 vmax, sqfs_u64 *out) +{ + return parse(in, len, diff, 10, vmin, vmax, out); +} + +int parse_uint_oct(const char *in, size_t len, size_t *diff, + sqfs_u64 vmin, sqfs_u64 vmax, sqfs_u64 *out) +{ + return parse(in, len, diff, 8, vmin, vmax, out); +} int parse_int(const char *in, size_t len, size_t *diff, sqfs_s64 vmin, sqfs_s64 vmax, sqfs_s64 *out) @@ -82,7 +96,7 @@ int parse_int(const char *in, size_t len, size_t *diff, *out = (sqfs_s64)temp; } - if (vmin != vmax && ((*out < vmin) || (*out > vmax))) + if ((vmin < vmax) && ((*out < vmin) || (*out > vmax))) return SQFS_ERROR_OUT_OF_BOUNDS; return 0; diff --git a/lib/util/test/parse_int.c b/lib/util/test/parse_int.c index 2bd5a7c..cf6a69f 100644 --- a/lib/util/test/parse_int.c +++ b/lib/util/test/parse_int.c @@ -74,5 +74,46 @@ int main(int argc, char **argv) ret = parse_int("-1234", -1, NULL, -1000, 1000, &s_out); TEST_EQUAL_I(ret, SQFS_ERROR_OUT_OF_BOUNDS); + /**** octal version *****/ + + /* must begin with a digit */ + ret = parse_uint_oct("a1234", -1, &diff, 0, 0, &out); + TEST_EQUAL_I(ret, SQFS_ERROR_CORRUPTED); + + /* can end with a non-digit... */ + ret = parse_uint_oct("1234a", -1, &diff, 0, 0, &out); + TEST_EQUAL_I(ret, 0); + TEST_EQUAL_UI(out, 01234); + TEST_EQUAL_UI(diff, 4); + + /* ...unless diff is NULL */ + ret = parse_uint_oct("1234a", -1, NULL, 0, 0, &out); + TEST_EQUAL_I(ret, SQFS_ERROR_CORRUPTED); + + /* numeric overflow is cought */ + ret = parse_uint_oct("2000000000000000000000", -1, NULL, 0, 0, &out); + TEST_EQUAL_I(ret, SQFS_ERROR_OVERFLOW); + + /* buffer length is adherered to */ + ret = parse_uint_oct("2000000000000000000000", 5, NULL, 0, 0, &out); + TEST_EQUAL_I(ret, 0); + TEST_EQUAL_UI(out, 020000); + + ret = parse_uint_oct("2000000000000000000000", 5, &diff, 0, 0, &out); + TEST_EQUAL_I(ret, 0); + TEST_EQUAL_UI(diff, 5); + TEST_EQUAL_UI(out, 020000); + + /* if vmin/vmax differ, check the range */ + ret = parse_uint_oct("1234", -1, NULL, 0, 01000, &out); + TEST_EQUAL_I(ret, SQFS_ERROR_OUT_OF_BOUNDS); + + ret = parse_uint_oct("1234", -1, NULL, 0, 02000, &out); + TEST_EQUAL_I(ret, 0); + TEST_EQUAL_UI(out, 01234); + + ret = parse_uint_oct("1234", -1, NULL, 02000, 03000, &out); + TEST_EQUAL_I(ret, SQFS_ERROR_OUT_OF_BOUNDS); + return EXIT_SUCCESS; } -- cgit v1.2.3