database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-12 16:21:30 +03:00
Code

pg_amcheck: Fix block number parsing on command line

Browse Source 
The previous code wouldn't handle higher block numbers on systems
where sizeof(long) == 4.

Reviewed-by: Mark Dilger <mark.dilger@enterprisedb.com>
Discussion: https://www.postgresql.org/message-id/flat/6a10a211-872b-3c4c-106b-909ae5fefa61%40enterprisedb.com
This commit is contained in:
Peter Eisentraut 2021-08-20 07:48:22 +02:00
parent 8d2d6ec770
commit f1899f251d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/bin/pg_amcheck/pg_amcheck.c
View File

@ -298,6 +298,7 @@ main(int argc, char *argv[])
long_options, &optindex)) != -1) long_options, &optindex)) != -1)
{ {
char *endptr; char *endptr;
unsigned long optval;
switch (c) switch (c)
{ {
@ -407,30 +408,34 @@ main(int argc, char *argv[])
} }
break; break;
case 7: case 7:
opts.startblock = strtol(optarg, &endptr, 10); errno = 0;
if (*endptr != '\0') optval = strtoul(optarg, &endptr, 10);
if (endptr == optarg || *endptr != '\0' || errno != 0)
{ {
pg_log_error("invalid start block"); pg_log_error("invalid start block");
exit(1); exit(1);
} }
if (opts.startblock > MaxBlockNumber || opts.startblock < 0) if (optval > MaxBlockNumber)
{ {
pg_log_error("start block out of bounds"); pg_log_error("start block out of bounds");
exit(1); exit(1);
} }
opts.startblock = optval;
break; break;
case 8: case 8:
opts.endblock = strtol(optarg, &endptr, 10); errno = 0;
if (*endptr != '\0') optval = strtoul(optarg, &endptr, 10);
if (endptr == optarg || *endptr != '\0' || errno != 0)
{ {
pg_log_error("invalid end block"); pg_log_error("invalid end block");
exit(1); exit(1);
} }
if (opts.endblock > MaxBlockNumber || opts.endblock < 0) if (optval > MaxBlockNumber)
{ {
pg_log_error("end block out of bounds"); pg_log_error("end block out of bounds");
exit(1); exit(1);
} }
opts.endblock = optval;
break; break;
case 9: case 9:
opts.rootdescend = true; opts.rootdescend = true;