[Midnightbsd-cvs] src [6670] trunk/sbin/umount/umount.c: free memory
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jun 15 12:39:50 EDT 2014
Revision: 6670
http://svnweb.midnightbsd.org/src/?rev=6670
Author: laffer1
Date: 2014-06-15 12:39:50 -0400 (Sun, 15 Jun 2014)
Log Message:
-----------
free memory
Modified Paths:
--------------
trunk/sbin/umount/umount.c
Modified: trunk/sbin/umount/umount.c
===================================================================
--- trunk/sbin/umount/umount.c 2014-06-15 16:38:48 UTC (rev 6669)
+++ trunk/sbin/umount/umount.c 2014-06-15 16:39:50 UTC (rev 6670)
@@ -359,8 +359,10 @@
do_rpc = 1;
}
- if (!namematch(ai))
+ if (!namematch(ai)) {
+ free(orignfsdirname);
return (1);
+ }
/* First try to unmount using the file system ID. */
snprintf(fsidbuf, sizeof(fsidbuf), "FSID:%d:%d", sfs->f_fsid.val[0],
sfs->f_fsid.val[1]);
@@ -369,13 +371,16 @@
if (errno != ENOENT || sfs->f_fsid.val[0] != 0 ||
sfs->f_fsid.val[1] != 0)
warn("unmount of %s failed", sfs->f_mntonname);
- if (errno != ENOENT)
+ if (errno != ENOENT) {
+ free(orignfsdirname);
return (1);
+ }
/* Compatibility for old kernels. */
if (sfs->f_fsid.val[0] != 0 || sfs->f_fsid.val[1] != 0)
warnx("retrying using path instead of file system ID");
if (unmount(sfs->f_mntonname, fflag) != 0) {
warn("unmount of %s failed", sfs->f_mntonname);
+ free(orignfsdirname);
return (1);
}
}
@@ -393,6 +398,7 @@
if (clp == NULL) {
warnx("%s: %s", hostp,
clnt_spcreateerror("MOUNTPROG"));
+ free(orignfsdirname);
return (1);
}
clp->cl_auth = authsys_create_default();
@@ -403,6 +409,7 @@
if (clnt_stat != RPC_SUCCESS) {
warnx("%s: %s", hostp,
clnt_sperror(clp, "RPCMNT_UMOUNT"));
+ free(orignfsdirname);
return (1);
}
/*
@@ -415,10 +422,10 @@
hostp, nfsdirname);
free_mtab();
}
- free(orignfsdirname);
auth_destroy(clp->cl_auth);
clnt_destroy(clp);
}
+ free(orignfsdirname);
return (0);
}
More information about the Midnightbsd-cvs
mailing list