From owner-svn-src-head@FreeBSD.ORG  Wed Jul 14 15:14:01 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0AC8010656A5;
	Wed, 14 Jul 2010 15:14:01 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EE0258FC18;
	Wed, 14 Jul 2010 15:14:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6EFE01R001562;
	Wed, 14 Jul 2010 15:14:00 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6EFE0SO001560;
	Wed, 14 Jul 2010 15:14:00 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201007141514.o6EFE0SO001560@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 14 Jul 2010 15:14:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210058 - head/sbin/geom/class/virstor
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jul 2010 15:14:01 -0000

Author: mav
Date: Wed Jul 14 15:14:00 2010
New Revision: 210058
URL: http://svn.freebsd.org/changeset/base/210058

Log:
  Do not bzero() NULL pointer on malloc() error.
  
  Submitted by:	Dmitry Luhtionov

Modified:
  head/sbin/geom/class/virstor/geom_virstor.c

Modified: head/sbin/geom/class/virstor/geom_virstor.c
==============================================================================
--- head/sbin/geom/class/virstor/geom_virstor.c	Wed Jul 14 15:11:29 2010	(r210057)
+++ head/sbin/geom/class/virstor/geom_virstor.c	Wed Jul 14 15:14:00 2010	(r210058)
@@ -459,9 +459,9 @@ virstor_label(struct gctl_req *req)
 				strlcpy(md.provider, name, sizeof(md.provider));
 		}
 		sect = malloc(ssize);
-		bzero(sect, ssize);
 		if (sect == NULL)
 			err(1, "Cannot allocate sector of %zu bytes", ssize);
+		bzero(sect, ssize);
 		virstor_metadata_encode(&md, sect);
 		error = my_g_metadata_store(name, sect, ssize);
 		free(sect);