From owner-svn-src-all@freebsd.org  Sat Nov  7 16:45:53 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 2FBC6A28A45;
 Sat,  7 Nov 2015 16:45:53 +0000 (UTC)
 (envelope-from bapt@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 EA19217DD;
 Sat,  7 Nov 2015 16:45:52 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA7Gjpqp006120;
 Sat, 7 Nov 2015 16:45:51 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA7Gjp9O006119;
 Sat, 7 Nov 2015 16:45:51 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201511071645.tA7Gjp9O006119@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 7 Nov 2015 16:45:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290500 - head/usr.bin/localedef
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: <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: Sat, 07 Nov 2015 16:45:53 -0000

Author: bapt
Date: Sat Nov  7 16:45:51 2015
New Revision: 290500
URL: https://svnweb.freebsd.org/changeset/base/290500

Log:
  Run memset only after having checked the return of malloc
  
  Submitted by:	pluknet

Modified:
  head/usr.bin/localedef/collate.c

Modified: head/usr.bin/localedef/collate.c
==============================================================================
--- head/usr.bin/localedef/collate.c	Sat Nov  7 16:22:29 2015	(r290499)
+++ head/usr.bin/localedef/collate.c	Sat Nov  7 16:45:51 2015	(r290500)
@@ -1256,11 +1256,11 @@ dump_collate(void)
 	 */
 	RB_NUMNODES(collchar_t, collchars, &collchars, n);
 	large = malloc(sizeof (collate_large_t) * n);
-	memset(large, 0, sizeof (collate_large_t) * n);
 	if (large == NULL) {
 		fprintf(stderr, "out of memory");
 		return;
 	}
+	memset(large, 0, sizeof (collate_large_t) * n);
 
 	i = 0;
 	RB_FOREACH(cc, collchars, &collchars) {