From owner-svn-src-head@freebsd.org  Fri Dec 30 21:00:46 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 73C48C98F44;
 Fri, 30 Dec 2016 21:00:46 +0000 (UTC)
 (envelope-from pstef@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 419401B4C;
 Fri, 30 Dec 2016 21:00:46 +0000 (UTC)
 (envelope-from pstef@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBUL0juU094219;
 Fri, 30 Dec 2016 21:00:45 GMT (envelope-from pstef@FreeBSD.org)
Received: (from pstef@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBUL0jjC094218;
 Fri, 30 Dec 2016 21:00:45 GMT (envelope-from pstef@FreeBSD.org)
Message-Id: <201612302100.uBUL0jjC094218@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pstef set sender to
 pstef@FreeBSD.org using -f
From: Piotr Pawel Stefaniak <pstef@FreeBSD.org>
Date: Fri, 30 Dec 2016 21:00:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r310863 - head/usr.bin/indent
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Dec 2016 21:00:46 -0000

Author: pstef
Date: Fri Dec 30 21:00:45 2016
New Revision: 310863
URL: https://svnweb.freebsd.org/changeset/base/310863

Log:
  indent(1): Avoid out of bounds access of array ps.paren_indents
  
  ps.p_l_follow can't be allowed to grow beyond maximum index of paren_indents.
  
  Approved by:	pfg (mentor)

Modified:
  head/usr.bin/indent/indent.c

Modified: head/usr.bin/indent/indent.c
==============================================================================
--- head/usr.bin/indent/indent.c	Fri Dec 30 20:48:22 2016	(r310862)
+++ head/usr.bin/indent/indent.c	Fri Dec 30 21:00:45 2016	(r310863)
@@ -525,7 +525,12 @@ check_type:
 	    break;
 
 	case lparen:		/* got a '(' or '[' */
-	    ++ps.p_l_follow;	/* count parens to make Healy happy */
+	    /* count parens to make Healy happy */
+	    if (++ps.p_l_follow == nitems(ps.paren_indents)) {
+		diag3(0, "Reached internal limit of %d unclosed parens",
+		    nitems(ps.paren_indents));
+		ps.p_l_follow--;
+	    }
 	    if (ps.want_blank && *token != '[' &&
 		    (ps.last_token != ident || proc_calls_space ||
 		    /* offsetof (1) is never allowed a space; sizeof (2) gets