From f912e2c8870ab17a2c4037f7d12a801480d8c5a7 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Wed, 24 Nov 2010 09:53:31 +0000 Subject: [PATCH] Add missing destrustion of cmd_context Lvm1 fallback code missed to destroy cmd_context in error path. --- WHATS_NEW | 1 + tools/lvmcmdline.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 8bde018fc..d81129d34 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.78 - ==================================== + Fix missing context desctruction in err path of lvm1 fallback in lvm2_main(). Fix memory leak in error path of parse_loop_device_name() from dmsetup. Fix missing dlclose in _init_formats() error path from init_format call. Fix missing fclose for _umount() in dmeventd snapshot plugin. diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 8171174b1..192531d3a 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -1447,10 +1447,12 @@ int lvm2_main(int argc, char **argv) if (!argc) { log_error("Falling back to LVM1 tools, but no " "command specified."); - return ECMD_FAILED; + ret = ECMD_FAILED; + goto out; } _exec_lvm1_command(argv); - return ECMD_FAILED; + ret = ECMD_FAILED; + goto out; } #ifdef READLINE_SUPPORT if (!alias && argc == 1) { -- 2.43.5