ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libmount: fix mem leak in do_mount_by_types() [coverity scan] 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2015-01-29 10:58:55 +01:00
parent edc4cf94a8
commit 7bc2fd3d23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libmount/src/context.c
View File

@ -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));

3
libmount/src/context_mount.c
View File

@ -787,8 +787,9 @@ static int do_mount_by_types(struct libmnt_context *cxt, const char *types)
if (strcmp(p, "auto") == 0) {
rc = mnt_context_guess_srcpath_fstype(cxt, &autotype);
if (rc) {
DBG(CXT, ul_debugobj(cxt, "failed to guess FS type"));
DBG(CXT, ul_debugobj(cxt, "failed to guess FS type [rc=%d]", rc));
free(p0);
free(autotype);
return rc;
}
p = autotype;