From owner-svn-src-all@FreeBSD.ORG  Tue Jul  2 17:34:35 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3C8138AB;
 Tue,  2 Jul 2013 17:34:35 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 296F81C4C;
 Tue,  2 Jul 2013 17:34:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r62HYZwJ020448;
 Tue, 2 Jul 2013 17:34:35 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r62HYZ0V020447;
 Tue, 2 Jul 2013 17:34:35 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201307021734.r62HYZ0V020447@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 2 Jul 2013 17:34:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252514 - head/sbin/swapon
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Jul 2013 17:34:35 -0000

Author: delphij
Date: Tue Jul  2 17:34:34 2013
New Revision: 252514
URL: http://svnweb.freebsd.org/changeset/base/252514

Log:
  Plug a memory leak.

Modified:
  head/sbin/swapon/swapon.c

Modified: head/sbin/swapon/swapon.c
==============================================================================
--- head/sbin/swapon/swapon.c	Tue Jul  2 17:17:42 2013	(r252513)
+++ head/sbin/swapon/swapon.c	Tue Jul  2 17:34:34 2013	(r252514)
@@ -491,6 +491,7 @@ swap_on_off_md(const char *name, char *m
 				if (!qflag)
 					warnx("%s: Device already in use",
 					    vnodefile);
+				free(vnodefile);
 				return (NULL);
 			}
 			error = run_cmd(&fd, "%s -a -t vnode -n -f %s",
@@ -498,6 +499,7 @@ swap_on_off_md(const char *name, char *m
 			if (error) {
 				warnx("mdconfig (attach) error: file=%s",
 				    vnodefile);
+				free(vnodefile);
 				return (NULL);
 			}
 			sfd = fdopen(fd, "r");
@@ -537,6 +539,7 @@ swap_on_off_md(const char *name, char *m
 				if (!qflag)
 					warnx("md%d on %s: Device already "
 					    "in use", mdunit, vnodefile);
+				free(vnodefile);
 				return (NULL);
 			}
 			error = run_cmd(NULL, "%s -a -t vnode -u %d -f %s",
@@ -544,6 +547,7 @@ swap_on_off_md(const char *name, char *m
 			if (error) {
 				warnx("mdconfig (attach) error: "
 				    "md%d on file=%s", mdunit, vnodefile);
+				free(vnodefile);
 				return (NULL);
 			}
 		}
@@ -557,6 +561,7 @@ swap_on_off_md(const char *name, char *m
 				if (!qflag)
 					warnx("md on %s: Device not found",
 					    vnodefile);
+				free(vnodefile);
 				return (NULL);
 			}
 			sfd = fdopen(fd, "r");
@@ -599,6 +604,7 @@ swap_on_off_md(const char *name, char *m
 				if (!qflag)
 					warnx("md%d on %s: Device not found",
 					    mdunit, vnodefile);
+				free(vnodefile);
 				return (NULL);
 			}
 		}
@@ -622,6 +628,7 @@ err:
 		fclose(sfd);
 	if (fd != -1)
 		close(fd);
+	free(vnodefile);
 	return (ret);
 }