Date: Tue, 6 Oct 2015 15:30:49 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r288925 - stable/9/usr.sbin/ndiscvt Message-ID: <201510061530.t96FUnjQ025193@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 (ports committer) Date: Tue Oct 6 15:30:48 2015 New Revision: 288925 URL: https://svnweb.freebsd.org/changeset/base/288925 Log: MFC r288120: Fix crash on parsing some inf files Modified: stable/9/usr.sbin/ndiscvt/inf.c stable/9/usr.sbin/ndiscvt/inf.h Directory Properties: stable/9/usr.sbin/ndiscvt/ (props changed) Modified: stable/9/usr.sbin/ndiscvt/inf.c ============================================================================== --- stable/9/usr.sbin/ndiscvt/inf.c Tue Oct 6 15:30:41 2015 (r288924) +++ stable/9/usr.sbin/ndiscvt/inf.c Tue Oct 6 15:30:48 2015 (r288925) @@ -887,6 +887,12 @@ regkey_add (const char *r) void push_word (const char *w) { + + if (idx == W_MAX) { + fprintf(stderr, "too many words; try bumping W_MAX in inf.h\n"); + exit(1); + } + if (w && strlen(w)) words[idx++] = w; else Modified: stable/9/usr.sbin/ndiscvt/inf.h ============================================================================== --- stable/9/usr.sbin/ndiscvt/inf.h Tue Oct 6 15:30:41 2015 (r288924) +++ stable/9/usr.sbin/ndiscvt/inf.h Tue Oct 6 15:30:48 2015 (r288925) @@ -4,7 +4,7 @@ * $FreeBSD$ */ -#define W_MAX 16 +#define W_MAX 32 struct section { const char * name;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510061530.t96FUnjQ025193>