From owner-svn-src-head@freebsd.org  Tue Jan 23 18:01:33 2018
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 8057CEBD104;
 Tue, 23 Jan 2018 18:01:33 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4E79F3952;
 Tue, 23 Jan 2018 18:01:33 +0000 (UTC) (envelope-from imp@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 78C0F11F15;
 Tue, 23 Jan 2018 18:01:32 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0NI1WEk082159;
 Tue, 23 Jan 2018 18:01:32 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0NI1Wxq082158;
 Tue, 23 Jan 2018 18:01:32 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201801231801.w0NI1Wxq082158@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 23 Jan 2018 18:01:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r328290 - head/stand/common
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/stand/common
X-SVN-Commit-Revision: 328290
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: Tue, 23 Jan 2018 18:01:33 -0000

Author: imp
Date: Tue Jan 23 18:01:32 2018
New Revision: 328290
URL: https://svnweb.freebsd.org/changeset/base/328290

Log:
  On malloc failure, be sure to close the include file that triggered
  it.
  
  CID: 1007775
  Sponsored by: Netflix

Modified:
  head/stand/common/interp.c

Modified: head/stand/common/interp.c
==============================================================================
--- head/stand/common/interp.c	Tue Jan 23 18:01:27 2018	(r328289)
+++ head/stand/common/interp.c	Tue Jan 23 18:01:32 2018	(r328290)
@@ -250,6 +250,7 @@ include(const char *filename)
 		snprintf(command_errbuf, sizeof(command_errbuf),
 		    "file '%s' line %d: memory allocation failure - aborting",
 		    filename, line);
+		close(fd);
 		return (CMD_ERROR);
 	}
 	strcpy(sp->text, cp);