From ba7536c0707890d478406484ea5a2ac391d4df4b Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 15 Apr 2020 11:15:56 +0200 Subject: [PATCH] memory_utils: directly NULL ptr in free_disarm() This should keep coverity happy. Fixes: Coverity 1461757. Signed-off-by: Christian Brauner --- src/lxc/memory_utils.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lxc/memory_utils.h b/src/lxc/memory_utils.h index 29878fb67..d3b68a1e9 100644 --- a/src/lxc/memory_utils.h +++ b/src/lxc/memory_utils.h @@ -41,10 +41,10 @@ define_cleanup_function(FILE *, fclose); define_cleanup_function(DIR *, closedir); #define __do_closedir call_cleaner(closedir) -#define free_disarm(ptr) \ - ({ \ - free(ptr); \ - move_ptr(ptr); \ +#define free_disarm(ptr) \ + ({ \ + free(ptr); \ + ptr = NULL; \ }) static inline void free_disarm_function(void *ptr) -- 2.47.2