revi-archive/xz-archive
1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2024-04-04 12:36:23 +02:00
Code Activity

Fix string to uint64_t conversion.

Browse source 
Thanks to Denis Excoffier for the bug report.
This commit is contained in:
Lasse Collin 2010-06-11 21:43:28 +03:00
parent 3e49c8acb0
commit e1b6935d60
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/xz/util.c
View file

@ -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');

13
src/xzdec/xzdec.c
View file

@ -153,6 +153,9 @@ memlimit_init(void)
/// \brief Convert a string to uint64_t
///
/// This is rudely copied from src/xz/util.c and modified a little. :-(
/// Since this function is used only for parsing the memory usage limit,
/// this cheats a little and saturates too big values to UINT64_MAX instead
/// of giving an error.
///
/// \param max Return value when the string "max" was specified.
///
@ -173,11 +176,17 @@ str_to_uint64(const char *value, uint64_t max)
do {
// Don't overflow.
if (result > (UINT64_MAX - 9) / 10)
if (result > UINT64_MAX / 10)
return UINT64_MAX;
result *= 10;
result += *value - '0';
// Another overflow check
const uint32_t add = *value - '0';
if (UINT64_MAX - add < result)
return UINT64_MAX;
result += add;
++value;
} while (*value >= '0' && *value <= '9');