summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/unexpand.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/unexpand.c b/src/unexpand.c
index 60a3f1d61..935f98600 100644
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -193,8 +193,7 @@ parse_tab_stops (char const *stops)
}
{
/* Detect overflow. */
- uintmax_t new_t = 10 * tabval + *stops - '0';
- if (UINTMAX_MAX / 10 < tabval || new_t < tabval * 10)
+ if (DECIMAL_DIGIT_ACCUMULATE (tabval, *stops - '0', UINTMAX_MAX))
{
size_t len = strspn (num_start, "0123456789");
char *bad_num = xstrndup (num_start, len);
@@ -203,7 +202,6 @@ parse_tab_stops (char const *stops)
ok = false;
stops = num_start + len - 1;
}
- tabval = new_t;
}
}
else
@@ -519,10 +517,8 @@ main (int argc, char **argv)
have_tabval = true;
}
{
- uintmax_t new_t = tabval * 10 + c - '0';
- if (UINTMAX_MAX / 10 < tabval || new_t < tabval * 10)
+ if (DECIMAL_DIGIT_ACCUMULATE (tabval, c - '0', UINTMAX_MAX))
error (EXIT_FAILURE, 0, _("tab stop value is too large"));
- tabval = new_t;
}
obsolete_tablist = true;
break;