From owner-svn-src-all@freebsd.org  Sun Jun  3 17:07:57 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77E81FE0579;
 Sun,  3 Jun 2018 17:07:57 +0000 (UTC)
 (envelope-from pstef@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 2E5B16F5D9;
 Sun,  3 Jun 2018 17:07:57 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0F9CF21699;
 Sun,  3 Jun 2018 17:07:57 +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 w53H7u3j001773;
 Sun, 3 Jun 2018 17:07:56 GMT (envelope-from pstef@FreeBSD.org)
Received: (from pstef@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w53H7udd001772;
 Sun, 3 Jun 2018 17:07:56 GMT (envelope-from pstef@FreeBSD.org)
Message-Id: <201806031707.w53H7udd001772@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: Sun, 3 Jun 2018 17:07:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r334570 - head/usr.bin/indent
X-SVN-Group: head
X-SVN-Commit-Author: pstef
X-SVN-Commit-Paths: head/usr.bin/indent
X-SVN-Commit-Revision: 334570
X-SVN-Commit-Repository: base
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.26
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: Sun, 03 Jun 2018 17:07:57 -0000

Author: pstef
Date: Sun Jun  3 17:07:56 2018
New Revision: 334570
URL: https://svnweb.freebsd.org/changeset/base/334570

Log:
  indent(1): the check for buffer overflow has to be done before copy

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

Modified: head/usr.bin/indent/indent.c
==============================================================================
--- head/usr.bin/indent/indent.c	Sun Jun  3 17:05:55 2018	(r334569)
+++ head/usr.bin/indent/indent.c	Sun Jun  3 17:07:56 2018	(r334570)
@@ -1193,10 +1193,10 @@ check_type:
 			*sc_end++ = ' ';
 			--line_no;
 		    }
+		    if (sc_end - save_com + com_end - com_start > sc_size)
+			errx(1, "input too long");
 		    bcopy(s_lab + com_start, sc_end, com_end - com_start);
 		    sc_end += com_end - com_start;
-		    if (sc_end >= &save_com[sc_size])
-			errx(1, "input too long");
 		    e_lab = s_lab + com_start;
 		    while (e_lab > s_lab && (e_lab[-1] == ' ' || e_lab[-1] == '\t'))
 			e_lab--;