diff options
| author | Mark Hindley <mark@hindley.org.uk> | 2018-11-12 09:10:28 +0000 |
|---|---|---|
| committer | Mark Hindley <mark@hindley.org.uk> | 2018-11-12 09:21:21 +0000 |
| commit | 2cc17d30309a1db16cccbf376a59ae40e47b6959 (patch) | |
| tree | cd51ee95799631af348ebae8630a69219bee99cd /src/basic/parse-util.c | |
| parent | ae65e91a5439f395e0da0cd8ffda95d6289849e1 (diff) | |
| parent | d4a3f291e3955648ea1d29e674b0f8f9b1556257 (diff) | |
Merge remote-tracking branch 'upstream/v239-stable' into merge_upstream.
Diffstat (limited to 'src/basic/parse-util.c')
| -rw-r--r-- | src/basic/parse-util.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c index 3935d8a3e..e25e8212d 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c @@ -642,6 +642,8 @@ int parse_permille_unbounded(const char *p) { r = safe_atoi(n, &v); if (r < 0) return r; + if (v < 0) + return -ERANGE; } else { pc = endswith(p, "%"); if (!pc) @@ -662,15 +664,14 @@ int parse_permille_unbounded(const char *p) { r = safe_atoi(n, &v); if (r < 0) return r; + if (v < 0) + return -ERANGE; if (v > (INT_MAX - q) / 10) return -ERANGE; v = v * 10 + q; } - if (v < 0) - return -ERANGE; - return v; } |