diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2021-08-20 07:48:22 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2021-08-20 10:51:59 +0200 |
| commit | f1899f251df421a4715ce5e231855eb6914bf77d (patch) | |
| tree | 4961e9babb6a85fe17c93767302aded0502657e5 | |
| parent | 8d2d6ec7708b475787fd92a9f828e554805e3df6 (diff) | |
| download | postgresql-f1899f251df421a4715ce5e231855eb6914bf77d.tar.gz postgresql-f1899f251df421a4715ce5e231855eb6914bf77d.zip | |
pg_amcheck: Fix block number parsing on command line
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
| -rw-r--r-- | src/bin/pg_amcheck/pg_amcheck.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/bin/pg_amcheck/pg_amcheck.c b/src/bin/pg_amcheck/pg_amcheck.c index a86a1c09878..af83d600abe 100644 --- a/src/bin/pg_amcheck/pg_amcheck.c +++ b/src/bin/pg_amcheck/pg_amcheck.c @@ -298,6 +298,7 @@ main(int argc, char *argv[]) long_options, &optindex)) != -1) { char *endptr; + unsigned long optval; switch (c) { @@ -407,30 +408,34 @@ main(int argc, char *argv[]) } break; case 7: - opts.startblock = strtol(optarg, &endptr, 10); - if (*endptr != '\0') + errno = 0; + optval = strtoul(optarg, &endptr, 10); + if (endptr == optarg || *endptr != '\0' || errno != 0) { pg_log_error("invalid start block"); exit(1); } - if (opts.startblock > MaxBlockNumber || opts.startblock < 0) + if (optval > MaxBlockNumber) { pg_log_error("start block out of bounds"); exit(1); } + opts.startblock = optval; break; case 8: - opts.endblock = strtol(optarg, &endptr, 10); - if (*endptr != '\0') + errno = 0; + optval = strtoul(optarg, &endptr, 10); + if (endptr == optarg || *endptr != '\0' || errno != 0) { pg_log_error("invalid end block"); exit(1); } - if (opts.endblock > MaxBlockNumber || opts.endblock < 0) + if (optval > MaxBlockNumber) { pg_log_error("end block out of bounds"); exit(1); } + opts.endblock = optval; break; case 9: opts.rootdescend = true; |