From d8f8fe03ac45bad693329c78dd71d4b1acc9df1b Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 4 Aug 2016 04:09:54 -0700 Subject: [PATCH] util-lib: add parse_percent_unbounded() for percentages over 100% (#3886) This permits CPUQuota to accept greater values as documented. --- src/basic/parse-util.c | 11 +++++++++-- src/basic/parse-util.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c index 77e85f658..757e5b412 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c @@ -540,7 +540,7 @@ int parse_fractional_part_u(const char **p, size_t digits, unsigned *res) { return 0; } -int parse_percent(const char *p) { +int parse_percent_unbounded(const char *p) { const char *pc, *n; unsigned v; int r; @@ -553,8 +553,15 @@ int parse_percent(const char *p) { r = safe_atou(n, &v); if (r < 0) return r; + + return (int) v; +} + +int parse_percent(const char *p) { + int v = parse_percent_unbounded(p); + if (v > 100) return -ERANGE; - return (int) v; + return v; } diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h index 1f420c050..e9e270904 100644 --- a/src/basic/parse-util.h +++ b/src/basic/parse-util.h @@ -108,4 +108,5 @@ int safe_atod(const char *s, double *ret_d); int parse_fractional_part_u(const char **s, size_t digits, unsigned *res); +int parse_percent_unbounded(const char *p); int parse_percent(const char *p); -- 2.30.2