From owner-svn-src-head@freebsd.org  Mon Mar 12 01:41:17 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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1F46CF3AC20;
 Mon, 12 Mar 2018 01:41:17 +0000 (UTC) (envelope-from gad@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 C27E288E48;
 Mon, 12 Mar 2018 01:41:16 +0000 (UTC) (envelope-from gad@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 BD64525135;
 Mon, 12 Mar 2018 01:41:16 +0000 (UTC) (envelope-from gad@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2C1fGP9029646;
 Mon, 12 Mar 2018 01:41:16 GMT (envelope-from gad@FreeBSD.org)
Received: (from gad@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2C1fGrU029645;
 Mon, 12 Mar 2018 01:41:16 GMT (envelope-from gad@FreeBSD.org)
Message-Id: <201803120141.w2C1fGrU029645@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gad set sender to gad@FreeBSD.org
 using -f
From: Garance A Drosehn <gad@FreeBSD.org>
Date: Mon, 12 Mar 2018 01:41:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r330787 - head/usr.sbin/lpr/common_source
X-SVN-Group: head
X-SVN-Commit-Author: gad
X-SVN-Commit-Paths: head/usr.sbin/lpr/common_source
X-SVN-Commit-Revision: 330787
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: Mon, 12 Mar 2018 01:41:17 -0000

Author: gad
Date: Mon Mar 12 01:41:16 2018
New Revision: 330787
URL: https://svnweb.freebsd.org/changeset/base/330787

Log:
  Fix the resource leak of a 'FILE *' which could happen in routine
  ctl_readcf() if a call to malloc failed.
  
  PR:		204955
  Reported by:	David Binderman

Modified:
  head/usr.sbin/lpr/common_source/ctlinfo.c

Modified: head/usr.sbin/lpr/common_source/ctlinfo.c
==============================================================================
--- head/usr.sbin/lpr/common_source/ctlinfo.c	Mon Mar 12 00:33:01 2018	(r330786)
+++ head/usr.sbin/lpr/common_source/ctlinfo.c	Mon Mar 12 01:41:16 2018	(r330787)
@@ -292,8 +292,10 @@ ctl_readcf(const char *ptrname, const char *cfname)
 	msize = sroom2 + CTI_LINEMAX;
 	msize = roundup(msize, 8);
 	cstart = malloc(msize);
-	if (cstart == NULL)
+	if (cstart == NULL) {
+		fclose(cfile);
 		return NULL;
+	}
 	memset(cstart, 0, msize);
 	cpriv = (struct cjprivate *)cstart;
 	cpriv->pub.cji_priv = cpriv;