From owner-svn-src-stable@freebsd.org  Fri May  6 01:37:07 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 BD119B2E94C;
 Fri,  6 May 2016 01:37:07 +0000 (UTC) (envelope-from pfg@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 8E0341C92;
 Fri,  6 May 2016 01:37:07 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u461b6ha050823;
 Fri, 6 May 2016 01:37:06 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u461b6Lv050821;
 Fri, 6 May 2016 01:37:06 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201605060137.u461b6Lv050821@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Fri, 6 May 2016 01:37:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r299148 - stable/10/sbin/restore
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 May 2016 01:37:07 -0000

Author: pfg
Date: Fri May  6 01:37:06 2016
New Revision: 299148
URL: https://svnweb.freebsd.org/changeset/base/299148

Log:
  MFC r298868, r298874:
  restore: fix memory and resource handle leaks.
  
  CID:		272297, 1007784

Modified:
  stable/10/sbin/restore/main.c
  stable/10/sbin/restore/symtab.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/restore/main.c
==============================================================================
--- stable/10/sbin/restore/main.c	Fri May  6 01:27:01 2016	(r299147)
+++ stable/10/sbin/restore/main.c	Fri May  6 01:37:06 2016	(r299148)
@@ -366,7 +366,8 @@ obsolete(int *argcp, char **argvp[])
 	if (flags) {
 		*p = '\0';
 		*nargv++ = flagsp;
-	}
+	} else
+		free(flagsp);
 
 	/* Copy remaining arguments. */
 	while ((*nargv++ = *argv++));

Modified: stable/10/sbin/restore/symtab.c
==============================================================================
--- stable/10/sbin/restore/symtab.c	Fri May  6 01:27:01 2016	(r299147)
+++ stable/10/sbin/restore/symtab.c	Fri May  6 01:37:06 2016	(r299148)
@@ -560,6 +560,7 @@ initsymtable(char *filename)
 		fprintf(stderr, "read: %s\n", strerror(errno));
 		panic("cannot read symbol table file %s\n", filename);
 	}
+	(void)close(fd);
 	switch (command) {
 	case 'r':
 		/*