From owner-svn-src-all@freebsd.org  Tue Oct  6 15:30:43 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B4439D0998;
 Tue,  6 Oct 2015 15:30:43 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 084CA1F3C;
 Tue,  6 Oct 2015 15:30:43 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t96FUgKY024490;
 Tue, 6 Oct 2015 15:30:42 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t96FUgQL024488;
 Tue, 6 Oct 2015 15:30:42 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201510061530.t96FUgQL024488@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Tue, 6 Oct 2015 15:30:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r288924 - stable/10/usr.sbin/ndiscvt
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Oct 2015 15:30:43 -0000

Author: amdmi3 (ports committer)
Date: Tue Oct  6 15:30:41 2015
New Revision: 288924
URL: https://svnweb.freebsd.org/changeset/base/288924

Log:
  MFC r288120: Fix crash on parsing some inf files

Modified:
  stable/10/usr.sbin/ndiscvt/inf.c
  stable/10/usr.sbin/ndiscvt/inf.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/ndiscvt/inf.c
==============================================================================
--- stable/10/usr.sbin/ndiscvt/inf.c	Tue Oct  6 14:56:37 2015	(r288923)
+++ stable/10/usr.sbin/ndiscvt/inf.c	Tue Oct  6 15:30:41 2015	(r288924)
@@ -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/10/usr.sbin/ndiscvt/inf.h
==============================================================================
--- stable/10/usr.sbin/ndiscvt/inf.h	Tue Oct  6 14:56:37 2015	(r288923)
+++ stable/10/usr.sbin/ndiscvt/inf.h	Tue Oct  6 15:30:41 2015	(r288924)
@@ -4,7 +4,7 @@
  * $FreeBSD$
  */
 
-#define W_MAX	16
+#define W_MAX	32
 
 struct section {
 	const char *	name;