From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 15 Apr 2020 09:15:56 +0000 (+0200)
Subject: memory_utils: directly NULL ptr in free_disarm()
X-Git-Tag: lxc-5.0.0~452^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ba7536c0707890d478406484ea5a2ac391d4df4b;p=mirror_lxc.git

memory_utils: directly NULL ptr in free_disarm()

This should keep coverity happy.

Fixes: Coverity 1461757.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

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)