From owner-svn-src-all@FreeBSD.ORG  Tue Mar 27 15:27:21 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 53C981065670;
	Tue, 27 Mar 2012 15:27:21 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3BE9A8FC12;
	Tue, 27 Mar 2012 15:27:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2RFRLPt092104;
	Tue, 27 Mar 2012 15:27:21 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2RFRLs5092102;
	Tue, 27 Mar 2012 15:27:21 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201203271527.q2RFRLs5092102@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 27 Mar 2012 15:27:21 +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: r233558 - head/sys/contrib/dev/acpica/components/parser
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Mar 2012 15:27:21 -0000

Author: jkim
Date: Tue Mar 27 15:27:20 2012
New Revision: 233558
URL: http://svn.freebsd.org/changeset/base/233558

Log:
  MFV:	r233551
  
  Fix two possible memory leaks in error path.
  
  Obtained from:	ACPICA

Modified:
  head/sys/contrib/dev/acpica/components/parser/psargs.c
Directory Properties:
  head/sys/contrib/dev/acpica/   (props changed)
  head/sys/contrib/dev/acpica/components/parser/   (props changed)

Modified: head/sys/contrib/dev/acpica/components/parser/psargs.c
==============================================================================
--- head/sys/contrib/dev/acpica/components/parser/psargs.c	Tue Mar 27 15:22:10 2012	(r233557)
+++ head/sys/contrib/dev/acpica/components/parser/psargs.c	Tue Mar 27 15:27:20 2012	(r233558)
@@ -672,6 +672,7 @@ AcpiPsGetNextField (
                 Arg = AcpiPsAllocOp (AML_INT_BYTELIST_OP);
                 if (!Arg)
                 {
+                    AcpiPsFreeOp (Field);
                     return_PTR (NULL);
                 }
 
@@ -717,6 +718,7 @@ AcpiPsGetNextField (
             Arg = AcpiPsAllocOp (AML_INT_NAMEPATH_OP);
             if (!Arg)
             {
+                AcpiPsFreeOp (Field);
                 return_PTR (NULL);
             }