From owner-svn-src-head@freebsd.org  Thu Dec 28 05:33:01 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 3BD68EA7999;
 Thu, 28 Dec 2017 05:33:01 +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 mx1.freebsd.org (Postfix) with ESMTPS id 063606B1B1;
 Thu, 28 Dec 2017 05:33:00 +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 vBS5X0IB024030;
 Thu, 28 Dec 2017 05:33:00 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBS5X0eY024029;
 Thu, 28 Dec 2017 05:33:00 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201712280533.vBS5X0eY024029@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: Thu, 28 Dec 2017 05:33:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r327262 - head/usr.sbin/binmiscctl
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/usr.sbin/binmiscctl
X-SVN-Commit-Revision: 327262
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: Thu, 28 Dec 2017 05:33:01 -0000

Author: imp
Date: Thu Dec 28 05:32:59 2017
New Revision: 327262
URL: https://svnweb.freebsd.org/changeset/base/327262

Log:
  Don't leak resources on duplicate -m or -M arguments. Last one wins.
  
  CID: 1204385, 1204384

Modified:
  head/usr.sbin/binmiscctl/binmiscctl.c

Modified: head/usr.sbin/binmiscctl/binmiscctl.c
==============================================================================
--- head/usr.sbin/binmiscctl/binmiscctl.c	Thu Dec 28 03:10:57 2017	(r327261)
+++ head/usr.sbin/binmiscctl/binmiscctl.c	Thu Dec 28 05:32:59 2017	(r327262)
@@ -299,10 +299,12 @@ add_cmd(__unused int argc, char *argv[], ximgact_binmi
 			break;
 
 		case 'm':
+			free(magic);
 			magic = strdup(optarg);
 			break;
 
 		case 'M':
+			free(mask);
 			mask = strdup(optarg);
 			xbe->xbe_flags |= IBF_USE_MASK;
 			break;