Whamcloud - gitweb
git://git.whamcloud.com
/
tools
/
e2fsprogs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix UBSan when shifting (1LL << 63)
[tools/e2fsprogs.git]
/
misc
/
mke2fs.c
diff --git
a/misc/mke2fs.c
b/misc/mke2fs.c
index
0ba2bf3
..
d7cf257
100644
(file)
--- a/
misc/mke2fs.c
+++ b/
misc/mke2fs.c
@@
-1102,7
+1102,7
@@
static void parse_extended_opts(struct ext2_super_block *param,
"\ttest_fs\n"
"\tdiscard\n"
"\tnodiscard\n"
"\ttest_fs\n"
"\tdiscard\n"
"\tnodiscard\n"
- "\encoding=<encoding>\n"
+ "\
t
encoding=<encoding>\n"
"\tencoding_flags=<flags>\n"
"\tquotatype=<quota type(s) to be enabled>\n\n"),
badopt ? badopt : "");
"\tencoding_flags=<flags>\n"
"\tquotatype=<quota type(s) to be enabled>\n\n"),
badopt ? badopt : "");
@@
-2399,6
+2399,7
@@
profile_error:
en);
exit(1);
}
en);
exit(1);
}
+ free(en);
fs_param.s_encoding = encoding;
ef = get_string_from_profile(fs_types, "encoding_flags", NULL);
if (ef) {
fs_param.s_encoding = encoding;
ef = get_string_from_profile(fs_types, "encoding_flags", NULL);
if (ef) {
@@
-2408,6
+2409,7
@@
profile_error:
_("Unknown encoding flags from profile: %s"), ef);
exit(1);
}
_("Unknown encoding flags from profile: %s"), ef);
exit(1);
}
+ free(ef);
} else
fs_param.s_encoding_flags =
e2p_get_encoding_flags(encoding);
} else
fs_param.s_encoding_flags =
e2p_get_encoding_flags(encoding);