From owner-svn-src-head@freebsd.org  Tue May  2 19:56:44 2017
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 33315D5BC8A;
 Tue,  2 May 2017 19:56:44 +0000 (UTC)
 (envelope-from emaste@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 02D557C0;
 Tue,  2 May 2017 19:56:43 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v42JuhSY037352;
 Tue, 2 May 2017 19:56:43 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v42JuhSu037351;
 Tue, 2 May 2017 19:56:43 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201705021956.v42JuhSu037351@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 2 May 2017 19:56:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317700 - head/usr.bin/grep/regex
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: Tue, 02 May 2017 19:56:44 -0000

Author: emaste
Date: Tue May  2 19:56:42 2017
New Revision: 317700
URL: https://svnweb.freebsd.org/changeset/base/317700

Log:
  bsdgrep: use calloc where appropriate in grep's tre-fastmatch
  
  Also apply style(9) to a related NULL check.
  
  Submitted by:	Kyle Evans <kevans91 at ksu.edu> (D10098)

Modified:
  head/usr.bin/grep/regex/tre-fastmatch.c

Modified: head/usr.bin/grep/regex/tre-fastmatch.c
==============================================================================
--- head/usr.bin/grep/regex/tre-fastmatch.c	Tue May  2 19:30:42 2017	(r317699)
+++ head/usr.bin/grep/regex/tre-fastmatch.c	Tue May  2 19:56:42 2017	(r317700)
@@ -630,7 +630,7 @@ tre_compile_fast(fastmatch_t *fg, const 
 	    if (escaped)
 	      {
 		if (!_escmap)
-		  _escmap = malloc(n * sizeof(bool));
+		  _escmap = calloc(n, sizeof(bool));
 		if (!_escmap)
 		  {
 		    free(tmp);
@@ -714,8 +714,8 @@ badpat:
     {
       if (fg->wescmap != NULL)
 	{
-	  fg->escmap = malloc(fg->len * sizeof(bool));
-	  if (!fg->escmap)
+	  fg->escmap = calloc(fg->len, sizeof(bool));
+	  if (fg->escmap != NULL)
 	    {
 	      tre_free_fast(fg);
 	      return REG_ESPACE;