From 006e5fa0ead3a2289df3ae6bbb22dbdc927b2331 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Wed, 5 Jan 2011 14:03:36 +0000 Subject: [PATCH] Add missing error path tests --- WHATS_NEW | 1 + lib/activate/dev_manager.c | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 3dc914121..1a4dcc77d 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.80 - ==================================== + Add missing tests in _setup_task(). Fail poll daemon creation when lvmcache_init() fails. Return defined value for errors in _copy_percent() and _snap_percent(). Correct return code of cmirrord when issuing 'start' when already running. diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 2fb141388..6d7d90522 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -75,19 +75,22 @@ static struct dm_task *_setup_task(const char *name, const char *uuid, if (!(dmt = dm_task_create(task))) return_NULL; - if (name) - dm_task_set_name(dmt, name); + if (name && !dm_task_set_name(dmt, name)) + goto_out; - if (uuid && *uuid) - dm_task_set_uuid(dmt, uuid); + if (uuid && *uuid && !dm_task_set_uuid(dmt, uuid)) + goto_out; - if (event_nr) - dm_task_set_event_nr(dmt, *event_nr); + if (event_nr && !dm_task_set_event_nr(dmt, *event_nr)) + goto_out; - if (major) - dm_task_set_major_minor(dmt, major, minor, 1); + if (major && !dm_task_set_major_minor(dmt, major, minor, 1)) + goto_out; return dmt; + out: + dm_task_destroy(dmt); + return NULL; } static int _info_run(const char *name, const char *dlid, struct dm_info *info, -- 2.43.5