From owner-svn-src-head@freebsd.org  Sat Nov 25 09:47:32 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 6A304DC1338;
 Sat, 25 Nov 2017 09:47:32 +0000 (UTC) (envelope-from avg@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 2E05F7B939;
 Sat, 25 Nov 2017 09:47:32 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAP9lVLW042029;
 Sat, 25 Nov 2017 09:47:31 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAP9lV0f042028;
 Sat, 25 Nov 2017 09:47:31 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201711250947.vAP9lV0f042028@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 25 Nov 2017 09:47:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326187 - head/cddl/contrib/opensolaris/cmd/zdb
X-SVN-Group: head
X-SVN-Commit-Author: avg
X-SVN-Commit-Paths: head/cddl/contrib/opensolaris/cmd/zdb
X-SVN-Commit-Revision: 326187
X-SVN-Commit-Repository: base
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.25
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: Sat, 25 Nov 2017 09:47:32 -0000

Author: avg
Date: Sat Nov 25 09:47:31 2017
New Revision: 326187
URL: https://svnweb.freebsd.org/changeset/base/326187

Log:
  zdb: follow-up to r326150, check if malloc succeeded
  
  Reported by:	rpokala
  MFC after:	1 week
  X-MFC with:	r326150

Modified:
  head/cddl/contrib/opensolaris/cmd/zdb/zdb.c

Modified: head/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Sat Nov 25 09:42:14 2017	(r326186)
+++ head/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Sat Nov 25 09:47:31 2017	(r326187)
@@ -3739,6 +3739,11 @@ zdb_embedded_block(char *thing)
 	}
 	ASSERT3U(BPE_GET_LSIZE(&bp), <=, SPA_MAXBLOCKSIZE);
 	buf = malloc(SPA_MAXBLOCKSIZE);
+	if (buf == NULL) {
+		(void) fprintf(stderr, "%s: failed to allocate %llu bytes\n",
+		    __func__, SPA_MAXBLOCKSIZE);
+		exit(1);
+	}
 	err = decode_embedded_bp(&bp, buf, BPE_GET_LSIZE(&bp));
 	if (err != 0) {
 		(void) printf("decode failed: %u\n", err);