mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

replace sloppy parsing of numeric values with strtonum (incr, decr, divert)

Browse Source 
still use integers, so use the natural bounds for these.

POSIX says m4 should error when these use non numeric values, and now they
do.

okay millert@
This commit is contained in:
espie 2017-11-11 12:55:59 +00:00
parent a5a3eb5504
commit 1818d08030
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
usr.bin/m4/eval.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: eval.c,v 1.76 2017/10/23 15:21:19 espie Exp $ */
/* $OpenBSD: eval.c,v 1.77 2017/11/11 12:55:59 espie Exp $ */
/* $NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $ */
/*
@ -120,6 +120,7 @@ void
expand_builtin(const char *argv[], int argc, int td)
{
int c, n;
const char *errstr;
int ac;
static int sysval = 0;
@ -175,18 +176,19 @@ expand_builtin(const char *argv[], int argc, int td)
{
int base = 10;
int maxdigits = 0;
const char *errstr;
if (argc > 3) {
base = strtonum(argv[3], 2, 36, &errstr);
if (errstr) {
m4errx(1, "expr: base %s invalid.", argv[3]);
m4errx(1, "expr: base is %s: %s.",
errstr, argv[3]);
}
}
if (argc > 4) {
maxdigits = strtonum(argv[4], 0, INT_MAX, &errstr);
if (errstr) {
m4errx(1, "expr: maxdigits %s invalid.", argv[4]);
m4errx(1, "expr: maxdigits is %s: %s.",
errstr, argv[4]);
}
}
if (argc > 2)
@ -225,8 +227,13 @@ expand_builtin(const char *argv[], int argc, int td)
* doincr - increment the value of the
* argument
*/
if (argc > 2)
pbnum(atoi(argv[2]) + 1);
if (argc > 2) {
n = strtonum(argv[2], INT_MIN, INT_MAX-1, &errstr);
if (errstr != NULL)
m4errx(1, "incr: argument is %s: %s.",
errstr, argv[2]);
pbnum(n + 1);
}
break;
case DECRTYPE:
@ -234,8 +241,13 @@ expand_builtin(const char *argv[], int argc, int td)
* dodecr - decrement the value of the
* argument
*/
if (argc > 2)
pbnum(atoi(argv[2]) - 1);
if (argc > 2) {
n = strtonum(argv[2], INT_MIN+1, INT_MAX, &errstr);
if (errstr)
m4errx(1, "decr: argument is %s: %s.",
errstr, argv[2]);
pbnum(n - 1);
}
break;
case SYSCTYPE:
@ -336,12 +348,18 @@ expand_builtin(const char *argv[], int argc, int td)
break;
case DIVRTYPE:
if (argc > 2 && (n = atoi(argv[2])) != 0)
dodiv(n);
else {
active = stdout;
oindex = 0;
if (argc > 2) {
n = strtonum(argv[2], INT_MIN, INT_MAX, &errstr);
if (errstr)
m4errx(1, "divert: argument is %s: %s.",
errstr, argv[2]);
if (n != 0) {
dodiv(n);
break;
}
}
active = stdout;
oindex = 0;
break;
case UNDVTYPE: