Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config(1): Avoid buffer overrun (modular build)

This commit is contained in:
uebayasi 2014-11-15 12:18:55 +00:00
parent 70dd8e7d2a
commit dfd51da465
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.bin/config/mkmakefile.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mkmakefile.c,v 1.27 2014/11/15 08:21:38 uebayasi Exp $ */ /* $NetBSD: mkmakefile.c,v 1.28 2014/11/15 12:18:55 uebayasi Exp $ */
/* /*
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -45,7 +45,7 @@
#endif #endif
#include <sys/cdefs.h> #include <sys/cdefs.h>
__RCSID("$NetBSD: mkmakefile.c,v 1.27 2014/11/15 08:21:38 uebayasi Exp $"); __RCSID("$NetBSD: mkmakefile.c,v 1.28 2014/11/15 12:18:55 uebayasi Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <ctype.h> #include <ctype.h>
@ -374,10 +374,10 @@ emitallkobjs(FILE *fp)
{ {
int i; int i;
attrbuf = ecalloc((size_t)nattrs, sizeof(attrbuf)); attrbuf = emalloc((size_t)nattrs * sizeof(attrbuf));
ht_enumerate(attrtab, emitallkobjsweighcb, NULL); ht_enumerate(attrtab, emitallkobjsweighcb, NULL);
ht_enumerate(attrtab, emitallkobjscb, fp); ht_enumerate(attrtab, emitallkobjscb, NULL);
qsort(attrbuf, (size_t)attridx, sizeof(struct attr *), attrcmp); qsort(attrbuf, (size_t)attridx, sizeof(struct attr *), attrcmp);
fputs("OBJS=", fp); fputs("OBJS=", fp);
@ -398,6 +398,11 @@ emitallkobjscb(const char *name, void *v, void *arg)
if (TAILQ_EMPTY(&a->a_files)) if (TAILQ_EMPTY(&a->a_files))
return 0; return 0;
attrbuf[attridx++] = a; attrbuf[attridx++] = a;
/* XXX nattrs tracking is not exact yet */
if (attridx == nattrs) {
nattrs *= 2;
attrbuf = erealloc(attrbuf, (size_t)nattrs * sizeof(attrbuf));
}
return 0; return 0;
} }