From 209da6efee0d0c442d574a0c5d82cf81d4a3c833 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Wed, 25 Jan 2012 22:16:04 +0000 Subject: [PATCH] Fix missing dmt destructor Also always initialize maj,min,patchlevel when success is returned. --- WHATS_NEW | 1 + lib/activate/activate.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/WHATS_NEW b/WHATS_NEW index 34ce37b73..6613e32a4 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.89 - ================================== + Fix memleak in target_version() error path (unsupported LIST_VERSIONS). Limit alignment to 32bit values. Check for correctness of uint64 dev_size value. Rename origin_only parameter to more generic flag use_layer for lv_info(). diff --git a/lib/activate/activate.c b/lib/activate/activate.c index bb3b240d2..6fa8ed7d5 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -481,7 +481,11 @@ int target_version(const char *target_name, uint32_t *maj, if (!dm_task_run(dmt)) { log_debug("Failed to get %s target version", target_name); /* Assume this was because LIST_VERSIONS isn't supported */ - return 1; + *maj = 0; + *min = 0; + *patchlevel = 0; + r = 1; + goto out; } target = dm_task_get_versions(dmt); -- 2.43.5