shred: fix overflow checking of command-line options

* src/shred.c (main): Limit -n (number of passes) value to
ULONG_MAX, not to UINT32_MAX, since the vars are unsigned long.
Limit the -s (file size) value to OFF_T_MAX.
This commit is contained in:
Paul Eggert committed 2014-05-10 11:43:15 -07:00
1 parent 03440189a0
commit a7603fa652
1 file changed
+5 -4
+5 -4
View File
@@ -1231,7 +1231,7 @@ main (int argc, char **argv)
{
uintmax_t tmp;
if (xstrtoumax (optarg, NULL, 10, &tmp, NULL) != LONGINT_OK
|| MIN (UINT32_MAX, SIZE_MAX / sizeof (int)) < tmp)
|| MIN (ULONG_MAX, SIZE_MAX / sizeof (int)) <= tmp)
{
error (EXIT_FAILURE, 0, _("%s: invalid number of passes"),
quotearg_colon (optarg));
@@ -1256,9 +1256,10 @@ main (int argc, char **argv)
case 's':
{
uintmax_t tmp;
if (xstrtoumax (optarg, NULL, 0, &tmp, "cbBkKMGTPEZY0")
!= LONGINT_OK)
intmax_t tmp;
if ((xstrtoimax (optarg, NULL, 0, &tmp, "cbBkKMGTPEZY0")
!= LONGINT_OK)
|| OFF_T_MAX < tmp)
{
error (EXIT_FAILURE, 0, _("%s: invalid file size"),
quotearg_colon (optarg));