diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2010-06-11 21:43:28 +0300 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2010-06-11 21:43:28 +0300 |
| commit | e1b6935d60a00405e6b5b455a3426d2248cc926c (patch) | |
| tree | ffdc16eedf44f0bf89fa2b54598be6ffccaf1429 /src/xz/util.c | |
| parent | Put the git commit to the filename in mydist rule. (diff) | |
| download | xz-e1b6935d60a00405e6b5b455a3426d2248cc926c.tar.xz | |
Fix string to uint64_t conversion.
Thanks to Denis Excoffier for the bug report.
Diffstat (limited to 'src/xz/util.c')
| -rw-r--r-- | src/xz/util.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/xz/util.c b/src/xz/util.c index deb5dcc2..19f5eee3 100644 --- a/src/xz/util.c +++ b/src/xz/util.c @@ -56,11 +56,17 @@ str_to_uint64(const char *name, const char *value, uint64_t min, uint64_t max) do { // Don't overflow. - if (result > (UINT64_MAX - 9) / 10) + if (result > UINT64_MAX / 10) goto error; result *= 10; - result += *value - '0'; + + // Another overflow check + const uint32_t add = *value - '0'; + if (UINT64_MAX - add < result) + goto error; + + result += add; ++value; } while (*value >= '0' && *value <= '9'); |