From owner-svn-src-stable@FreeBSD.ORG  Tue Jan 20 20:42:56 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D14D654F;
 Tue, 20 Jan 2015 20:42:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 BCB6898F;
 Tue, 20 Jan 2015 20:42:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0KKguos020655;
 Tue, 20 Jan 2015 20:42:56 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0KKguFS020653;
 Tue, 20 Jan 2015 20:42:56 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201501202042.t0KKguFS020653@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 20 Jan 2015 20:42:56 +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: r277436 - stable/10/usr.sbin/fstyp
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.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jan 2015 20:42:56 -0000

Author: trasz
Date: Tue Jan 20 20:42:55 2015
New Revision: 277436
URL: https://svnweb.freebsd.org/changeset/base/277436

Log:
  MFC r276704:
  
  Fix memory leaks.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/fstyp/ext2fs.c
  stable/10/usr.sbin/fstyp/ntfs.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/fstyp/ext2fs.c
==============================================================================
--- stable/10/usr.sbin/fstyp/ext2fs.c	Tue Jan 20 20:41:32 2015	(r277435)
+++ stable/10/usr.sbin/fstyp/ext2fs.c	Tue Jan 20 20:42:55 2015	(r277436)
@@ -85,6 +85,7 @@ fstyp_ext2fs(FILE *fp, char *label, size
 	}
 
 	strlcpy(label, s_volume_name, size);
+	free(fs);
 
 	return (0);
 }

Modified: stable/10/usr.sbin/fstyp/ntfs.c
==============================================================================
--- stable/10/usr.sbin/fstyp/ntfs.c	Tue Jan 20 20:41:32 2015	(r277435)
+++ stable/10/usr.sbin/fstyp/ntfs.c	Tue Jan 20 20:42:55 2015	(r277436)
@@ -108,7 +108,7 @@ fstyp_ntfs(FILE *fp, char *label, size_t
 
 	bf = (struct ntfs_bootfile *)read_buf(fp, 0, 512);
 	if (bf == NULL || strncmp(bf->bf_sysid, "NTFS    ", 8) != 0)
-		return (1);
+		goto fail;
 
 	mftrecsz = bf->bf_mftrecsz;
 	recsize = (mftrecsz > 0) ? (mftrecsz * bf->bf_bps * bf->bf_spc) : (1 << -mftrecsz);