diff options
| author |   reed <reed@NetBSD.org> | 2006-11-22 16:15:42 +0000 |
|---|---|---|
| committer | reed <reed@NetBSD.org> | 2006-11-22 16:15:42 +0000 |
| commit | 0d5fa63d481044587e4dec7907c85afc2adc6d2a (patch) | |
| tree | 8d292d117148f2773db1d87745fb67a2bcf3a7e9 | |
| parent | 29485e36d6f4635d51ffcc6db604cca181e19a98 (diff) | |
| download | bsdgames-darwin-0d5fa63d481044587e4dec7907c85afc2adc6d2a.tar.gz bsdgames-darwin-0d5fa63d481044587e4dec7907c85afc2adc6d2a.tar.zst bsdgames-darwin-0d5fa63d481044587e4dec7907c85afc2adc6d2a.zip | |
Check that -w width is not above maximum. (It already checks for zero or
negative.) Using width above DWIDTH may cause overflow as noted by Gruzicki
Wlodek on bugtraq.
While here replace one use of 132 with DWIDTH.
| -rw-r--r-- | banner/banner.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/banner/banner.c b/banner/banner.c index 74a9db31..7fed9a68 100644 --- a/banner/banner.c +++ b/banner/banner.c @@ -1,4 +1,4 @@ -/* $NetBSD: banner.c,v 1.15 2005/07/01 01:13:05 jmc Exp $ */ +/* $NetBSD: banner.c,v 1.16 2006/11/22 16:15:42 reed Exp $ */ /* * Copyright (c) 1980, 1993, 1994 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993, 1994\n\ #if 0 static char sccsid[] = "@(#)banner.c 8.4 (Berkeley) 4/29/95"; #else -__RCSID("$NetBSD: banner.c,v 1.15 2005/07/01 01:13:05 jmc Exp $"); +__RCSID("$NetBSD: banner.c,v 1.16 2006/11/22 16:15:42 reed Exp $"); #endif #endif /* not lint */ @@ -1046,7 +1046,7 @@ main(int argc, char *argv[]) break; case 'w': width = atoi(optarg); - if (width <= 0) + if (width <= 0 || width > DWIDTH) errx(1, "illegal argument for -w option"); break; case '?': @@ -1058,7 +1058,7 @@ main(int argc, char *argv[]) argv += optind; for (i = 0; i < width; i++) { - j = i * 132 / width; + j = i * DWIDTH / width; print[j] = 1; } |