[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 10/10] [grolbp]: Fix range check after strtol(3)
From: |
Alejandro Colomar |
Subject: |
[PATCH v5 10/10] [grolbp]: Fix range check after strtol(3) |
Date: |
Sat, 16 Mar 2024 13:35:15 +0100 |
In case INT_MAX==LONG_MAX, we need to check for ERANGE to reject
high values. The test 'n > INT_MAX' would never be true.
Fixes: d21a9dbc7a83 ("* src/devices/grolbp/lbp.cc: (long_options): Add
-w/--linewidth option.")
Link: <https://savannah.gnu.org/bugs/?65451>
Link: <https://savannah.gnu.org/bugs/?65452>
Cc: "G. Branden Robinson" <branden@debian.org>
Cc: Dave Kemper <saint.snit@gmail.com>
Cc: "James K. Lowden" <jklowden@schemamania.org>
Cc: Colin Watson <cjwatson@debian.org>
Cc: Werner LEMBERG <wl@gnu.org>
Cc: James Clark <jjc@jclark.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
src/devices/grolbp/lbp.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/devices/grolbp/lbp.cpp b/src/devices/grolbp/lbp.cpp
index c05b42ec3..c28f2e672 100644
--- a/src/devices/grolbp/lbp.cpp
+++ b/src/devices/grolbp/lbp.cpp
@@ -707,10 +707,11 @@ int main(int argc, char **argv)
case 'w':
{
char *ptr;
+ errno = 0;
long n = strtol(optarg, &ptr, 10);
if (ptr == optarg)
error("argument for -w must be a non-negative integer");
- else if (n < 0 || n > INT_MAX)
+ else if (errno == ERANGE || n < 0 || n > INT_MAX)
error("out of range argument for -w");
else
linewidth_factor = int(n);
--
2.43.0
signature.asc
Description: PGP signature
- [PATCH v5 00/10] strtol(3)-related fixes, (continued)
- [PATCH v5 00/10] strtol(3)-related fixes, Alejandro Colomar, 2024/03/16
- [PATCH v5 01/10] [libgroff]: Remove redundant checks., Alejandro Colomar, 2024/03/16
- [PATCH v5 02/10] [libgroff]: Remove dead code, Alejandro Colomar, 2024/03/16
- [PATCH v5 03/10] src/: Remove redundant checks after strtol(3)., Alejandro Colomar, 2024/03/16
- [PATCH v5 04/10] [grolbp]: Remove bogus (and redundant) check, Alejandro Colomar, 2024/03/16
- [PATCH v5 05/10] src/: ceil_prime(): Add function to get the lowest prime not less than n, Alejandro Colomar, 2024/03/16
- [PATCH v5 06/10] [indxbib]: Don't else after [[noreturn]], Alejandro Colomar, 2024/03/16
- [PATCH v5 07/10] [indxbib]: Clear errno before calling strtol(3), Alejandro Colomar, 2024/03/16
- [PATCH v5 08/10] [indxbib]: Remove dead code, Alejandro Colomar, 2024/03/16
- [PATCH v5 09/10] [indxbib]: Collapse related tests, Alejandro Colomar, 2024/03/16
- [PATCH v5 10/10] [grolbp]: Fix range check after strtol(3),
Alejandro Colomar <=
[PATCH v3 5/9] src/: ceil_prime(): Add function to get the lowest prime not smaller than n, Alejandro Colomar, 2024/03/15
[PATCH v3 1/9] [libgroff]: Remove redundant checks., Alejandro Colomar, 2024/03/15
[PATCH v3 7/9] [indxbib]: Clear errno before calling strtol(3), Alejandro Colomar, 2024/03/15
[PATCH v3 8/9] [indxbib]: Remove dead code, Alejandro Colomar, 2024/03/15
[PATCH v3 6/9] [indxbib]: Don't else after [[noreturn]], Alejandro Colomar, 2024/03/15
[PATCH v3 9/9] [indxbib]: Collapse related tests, Alejandro Colomar, 2024/03/15