diff options
| author |   nicm <nicm@openbsd.org> | 2010-07-14 13:13:42 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-07-14 13:13:42 +0000 |
| commit | c57b7382c926e506dc6a46223e2875f5851a136d (patch) | |
| tree | 70c0b1455d11f4e702e7eec79685e994eee878e6 | |
| parent | Let vga_pci.c build in kernel configs without acpi. ok kettenis@ (diff) | |
| download | wireguard-openbsd-c57b7382c926e506dc6a46223e2875f5851a136d.tar.xz wireguard-openbsd-c57b7382c926e506dc6a46223e2875f5851a136d.zip | |
Zero the pitem array so checking items after those used works as
expected, also do not look beyond the size of the array.
ok otto deraadt
| -rw-r--r-- | usr.bin/yacc/reader.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c index 3a20067dd04..a36db1d0856 100644 --- a/usr.bin/yacc/reader.c +++ b/usr.bin/yacc/reader.c @@ -1,4 +1,4 @@ -/* $OpenBSD: reader.c,v 1.21 2009/10/27 23:59:50 deraadt Exp $ */ +/* $OpenBSD: reader.c,v 1.22 2010/07/14 13:13:42 nicm Exp $ */ /* $NetBSD: reader.c,v 1.5 1996/03/19 03:21:43 jtc Exp $ */ /* @@ -1120,12 +1120,8 @@ initialize_grammar(void) { nitems = 4; maxitems = 300; - pitem = (bucket **) MALLOC(maxitems*sizeof(bucket *)); + pitem = (bucket **) CALLOC(maxitems, sizeof(bucket *)); if (pitem == 0) no_space(); - pitem[0] = 0; - pitem[1] = 0; - pitem[2] = 0; - pitem[3] = 0; nrules = 3; maxrules = 100; @@ -1150,9 +1146,11 @@ initialize_grammar(void) void expand_items(void) { + int olditems = maxitems; maxitems += 300; pitem = (bucket **) REALLOC(pitem, maxitems*sizeof(bucket *)); if (pitem == 0) no_space(); + memset(pitem + olditems, 0, (maxitems - olditems)*sizeof(bucket *)); } @@ -1242,7 +1240,8 @@ end_rule(void) if (!last_was_action && plhs[nrules]->tag) { for (i = nitems - 1; pitem[i]; --i) continue; - if (pitem[i+1] == 0 || pitem[i+1]->tag != plhs[nrules]->tag) + if (i == maxitems - 1 || pitem[i+1] == 0 || + pitem[i+1]->tag != plhs[nrules]->tag) default_action_warning(); } |