From owner-svn-src-head@freebsd.org  Wed Mar 22 17:28:55 2017
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 F29A1D18834;
 Wed, 22 Mar 2017 17:28:54 +0000 (UTC)
 (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id B736C182E;
 Wed, 22 Mar 2017 17:28:54 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2MHSrCn020089;
 Wed, 22 Mar 2017 17:28:53 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2MHSrZe020088;
 Wed, 22 Mar 2017 17:28:53 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201703221728.v2MHSrZe020088@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Wed, 22 Mar 2017 17:28:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315717 - head/usr.sbin/ctm/ctm
X-SVN-Group: head
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.23
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: Wed, 22 Mar 2017 17:28:55 -0000

Author: ngie
Date: Wed Mar 22 17:28:53 2017
New Revision: 315717
URL: https://svnweb.freebsd.org/changeset/base/315717

Log:
  ctm: fix memory leaks in Pass1(..)
  
  Call `Delete(..)` (a free(3) wrapper) on `name` when bailing from the
  function.
  
  Submitted by:	Tom Rix <trix@juniper.net>
  Reviewed by:	ngie
  Differential Revision:	D10097
  Sponsored by:	Dell EMC Isilon, Juniper

Modified:
  head/usr.sbin/ctm/ctm/ctm_pass1.c

Modified: head/usr.sbin/ctm/ctm/ctm_pass1.c
==============================================================================
--- head/usr.sbin/ctm/ctm/ctm_pass1.c	Wed Mar 22 17:06:57 2017	(r315716)
+++ head/usr.sbin/ctm/ctm/ctm_pass1.c	Wed Mar 22 17:28:53 2017	(r315717)
@@ -114,6 +114,7 @@ Pass1(FILE *fd, unsigned applied)
 		    }
 		    if (name[0] == '/') {
 			Fatal("Absolute paths are illegal.");
+			Delete(name);
 			return Exit_Mess;
 		    }
 		    q = name;
@@ -121,6 +122,7 @@ Pass1(FILE *fd, unsigned applied)
 			if (q[0] == '.' && q[1] == '.')
 			    if (q[2] == '/' || q[2] == '\0') {
 				Fatal("Paths containing '..' are illegal.");
+				Delete(name);
 				return Exit_Mess;
 			    }
 			if ((q = strchr(q, '/')) == NULL)