From 7bc2fd3d2368c88c26ddc43e5f6dd3f9ac1c488d Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 29 Jan 2015 10:58:55 +0100 Subject: libmount: fix mem leak in do_mount_by_types() [coverity scan] Signed-off-by: Karel Zak --- libmount/src/context.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libmount/src/context.c') diff --git a/libmount/src/context.c b/libmount/src/context.c index f623f34a7..dff7a47fd 100644 --- a/libmount/src/context.c +++ b/libmount/src/context.c @@ -1647,8 +1647,9 @@ int mnt_context_prepare_target(struct libmnt_context *cxt) return 0; } -/* Guess type, but not set to cxt->fs, use free() for the result. It's no error - * when we're not able to guess a filesystem type. +/* Guess type, but not set to cxt->fs, always use free() for the result. It's + * no error when we're not able to guess a filesystem type. Note that error + * does not mean that result in @type is NULL. */ int mnt_context_guess_srcpath_fstype(struct libmnt_context *cxt, char **type) { @@ -1717,8 +1718,8 @@ int mnt_context_guess_fstype(struct libmnt_context *cxt) rc = mnt_context_guess_srcpath_fstype(cxt, &type); if (rc == 0 && type) __mnt_fs_set_fstype_ptr(cxt->fs, type); - else - free(type); + + free(type); done: DBG(CXT, ul_debugobj(cxt, "FS type: %s [rc=%d]", mnt_fs_get_fstype(cxt->fs), rc)); -- cgit v1.2.3-55-g7522