svn commit: r330787 - head/usr.sbin/lpr/common_source

Garance A Drosehn gad at FreeBSD.org
Mon Mar 12 01:41:17 UTC 2018


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;


More information about the svn-src-all mailing list