diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2003-07-14 23:22:36 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2003-07-14 23:22:36 +0000 |
| commit | b3985a411a31711c773f3c516d03331cf3422ca2 (patch) | |
| tree | 57846068fe8e22edf4b7c3df5817e35515144c6c /usr.bin | |
| parent | 7647529f02f8767aacad9a672d3bbff826f81418 (diff) | |
range-check numeric arguments (-num, -A num, -B num)
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/grep/grep.c | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c index 6cfa2f7f61c..729d1a42408 100644 --- a/usr.bin/grep/grep.c +++ b/usr.bin/grep/grep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grep.c,v 1.20 2003/07/10 17:02:48 millert Exp $ */ +/* $OpenBSD: grep.c,v 1.21 2003/07/14 23:22:35 millert Exp $ */ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav @@ -231,6 +231,8 @@ int main(int argc, char *argv[]) { int c, lastc, prevoptind, i; + long l; + char *ep; switch (__progname[0]) { case 'e': @@ -267,22 +269,34 @@ main(int argc, char *argv[]) switch (c) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': - if (optind == prevoptind && isdigit(lastc)) + if (optind == prevoptind && isdigit(lastc)) { + if (Aflag > INT_MAX / 10) + errx(2, "context out of range"); Aflag = Bflag = (Aflag * 10) + (c - '0'); - else + } else Aflag = Bflag = c - '0'; break; case 'A': - Aflag = strtol(optarg, NULL, 10); - break; case 'B': - Bflag = strtol(optarg, NULL, 10); + l = strtol(optarg, &ep, 10); + if (ep == optarg || *ep != '\0' || + l <= 0 || l >= INT_MAX) + errx(2, "context out of range"); + if (c == 'A') + Aflag = (int)l; + else + Bflag = (int)l; break; case 'C': if (optarg == NULL) Aflag = Bflag = 2; - else - Aflag = Bflag = strtol(optarg, NULL, 10); + else { + l = strtol(optarg, &ep, 10); + if (ep == optarg || *ep != '\0' || + l <= 0 || l >= INT_MAX) + errx(2, "context out of range"); + Aflag = Bflag = (int)l; + } break; case 'E': Fflag = Gflag = 0; |