Make destroy_toolcontext() better able to handle NULL pointers.

Part of twoerner's log_error() patches.

Signed-off-by: Thomas Woerner <twoerner@redhat.com>
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>

diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
index 2ffea19af6a0878ea92b8816abcf7da3bd4d51b8..820bf9a8da5368d936cdae858b3c16b4101d6b55 100644 (file)
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -1302,12 +1302,15 @@ void destroy_toolcontext(struct cmd_context *cmd)
        label_exit();
        _destroy_segtypes(&cmd->segtypes);
        _destroy_formats(&cmd->formats);
-       cmd->filter->destroy(cmd->filter);
-       dm_pool_destroy(cmd->mem);
+       if (cmd->filter)
+               cmd->filter->destroy(cmd->filter);
+       if (cmd->mem)
+               dm_pool_destroy(cmd->mem);
        dev_cache_exit();
        _destroy_tags(cmd);
        _destroy_tag_configs(cmd);
-       dm_pool_destroy(cmd->libmem);
+       if (cmd->libmem)
+               dm_pool_destroy(cmd->libmem);
        dm_free(cmd);
 
        release_log_memory();