mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
dumpconfig: fix memleak when using --mergedconfig
Check whether lvm dumpconfig --mergedconfig is used only with --type current (where we're merging current config and the config supplied on command line). With other types the config was merged, but it was thrown away since we're generating other type of config anyway. This lead to a memleak. Error out if --mergedconfig is used with anything else than --type current (or without specifying --type in which case the --type current is used by default).
This commit is contained in:
parent
aed36c12f8
commit
25f5e2da8d
@ -1,5 +1,6 @@
|
||||
Version 2.02.106 -
|
||||
====================================
|
||||
Don't allow --mergedconfig without --type current in dumpconfig. Fix memleak.
|
||||
Make global/lvdisplay_shows_full_device_path lvm.conf setting profilable.
|
||||
Make global/{units|si_unit_consistency|suffix} lvm.conf setting profilable.
|
||||
Validate minimal chunk size for snapshot COW volume in lvconvert.
|
||||
|
@ -126,6 +126,9 @@ int dumpconfig(struct cmd_context *cmd, int argc, char **argv)
|
||||
"no effect with --type current");
|
||||
return EINVALID_CMD_LINE;
|
||||
}
|
||||
} else if (arg_count(cmd, mergedconfig_ARG)) {
|
||||
log_error("--mergedconfig has no effect without --type current");
|
||||
return EINVALID_CMD_LINE;
|
||||
}
|
||||
|
||||
if (!_get_vsn(cmd, &tree_spec.version))
|
||||
|
Loading…
Reference in New Issue
Block a user