From owner-svn-src-all@FreeBSD.ORG  Tue May  5 09:33:33 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F087F979;
 Tue,  5 May 2015 09:33:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 DF4801641;
 Tue,  5 May 2015 09:33:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t459XWMK068318;
 Tue, 5 May 2015 09:33:32 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t459XW2A068317;
 Tue, 5 May 2015 09:33:32 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201505050933.t459XW2A068317@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 5 May 2015 09:33:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282466 - head/usr.bin/checknr
X-SVN-Group: head
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 May 2015 09:33:33 -0000

Author: bapt
Date: Tue May  5 09:33:32 2015
New Revision: 282466
URL: https://svnweb.freebsd.org/changeset/base/282466

Log:
  Properly assign open and close brackets and checks memory
  
  Obtained from:	NetBSD

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

Modified: head/usr.bin/checknr/checknr.c
==============================================================================
--- head/usr.bin/checknr/checknr.c	Tue May  5 09:33:02 2015	(r282465)
+++ head/usr.bin/checknr/checknr.c	Tue May  5 09:33:32 2015	(r282466)
@@ -215,8 +215,18 @@ main(int argc, char **argv)
 			for (i=0; br[i].opbr; i++)
 				;
 			for (cp=argv[1]+3; cp[-1]; cp += 6) {
-				br[i].opbr = strncpy(malloc(3), cp, 2);
-				br[i].clbr = strncpy(malloc(3), cp+3, 2);
+				char *tmp;
+
+				if (i >= MAXBR)
+					errx(1, "too many pairs");
+				if ((tmp = malloc(3)) == NULL)
+					err(1, "malloc");
+				strlcpy(tmp, cp, 3);
+				br[i].opbr = tmp;
+				if ((tmp = malloc(3)) == NULL)
+					err(1, "malloc");
+				strlcpy(tmp, cp+3, 3);
+				br[i].clbr = tmp;
 				addmac(br[i].opbr);	/* knows pairs are also known cmds */
 				addmac(br[i].clbr);
 				i++;