From owner-cvs-all@FreeBSD.ORG Wed Aug 17 11:22:06 2005 Return-Path: X-Original-To: cvs-all@freebsd.org Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3840116A41F; Wed, 17 Aug 2005 11:22:06 +0000 (GMT) (envelope-from Danovitsch@Vitsch.net) Received: from amsfep15-int.chello.nl (amsfep15-int.chello.nl [213.46.243.27]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB37043D46; Wed, 17 Aug 2005 11:22:04 +0000 (GMT) (envelope-from Danovitsch@Vitsch.net) Received: from Vitsch.net ([62.195.249.78]) by amsfep15-int.chello.nl (InterMail vM.6.01.04.04 201-2131-118-104-20050224) with ESMTP id <20050817112202.PRSX10024.amsfep15-int.chello.nl@Vitsch.net>; Wed, 17 Aug 2005 13:22:02 +0200 Received: from [192.168.45.9] (i248222.upc-i.chello.nl [62.195.248.222]) by Vitsch.net (8.12.3p2/8.11.3) with ESMTP id j7HBLJmt033820; Wed, 17 Aug 2005 13:21:19 +0200 (CEST) (envelope-from Danovitsch@Vitsch.net) From: "Daan Vreeken [PA4DAN]" Organization: Vitsch Electronics To: Poul-Henning Kamp Date: Wed, 17 Aug 2005 13:21:30 +0200 User-Agent: KMail/1.8 References: <200508162245.j7GMjXkg034781@repoman.freebsd.org> In-Reply-To: <200508162245.j7GMjXkg034781@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200508171321.31251.Danovitsch@Vitsch.net> Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/usr.sbin/boot0cfg Makefile boot0cfg.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Aug 2005 11:22:06 -0000 On Wednesday 17 August 2005 00:45, Poul-Henning Kamp wrote: > phk 2005-08-16 22:45:33 UTC > > FreeBSD src repository > > Modified files: (Branch: RELENG_6) > usr.sbin/boot0cfg Makefile boot0cfg.c > Log: > MFC: use g_ctl for modifying metadata if possible. Doesn't this change miss a call to gctl_free() in the case gctl_issue() returns NULL? Supposed fix : ============== BEGIN ============= --- boot0cfg.c.org Wed Aug 17 00:45:33 2005 +++ boot0cfg.c Wed Aug 17 13:16:39 2005 @@ -282,8 +282,10 @@ gctl_ro_param(grq, "geom", -1, q); gctl_ro_param(grq, "data", mbr_size, mbr); q = gctl_issue(grq); - if (q == NULL) + if (q == NULL) { + gctl_free(grq); return; + } warnx("%s: %s", fname, q); gctl_free(grq); =============== END ============ > Approved by: re@ > > Revision Changes Path > 1.8.12.1 +3 -0 src/usr.sbin/boot0cfg/Makefile > 1.19.2.1 +22 -1 src/usr.sbin/boot0cfg/boot0cfg.c > _______________________________________________ > cvs-src@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/cvs-src > To unsubscribe, send any mail to "cvs-src-unsubscribe@freebsd.org" grtz, Daan