From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 20 Feb 2021 02:17:10 +0000 (+0100)
Subject: memory_utils: adapt to new pointer error macros
X-Git-Tag: lxc-5.0.0~274^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6407ddf4dac667258fdc16a71a500bccd211e76e;p=thirdparty%2Flxc.git

memory_utils: adapt to new pointer error macros

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

diff --git a/src/lxc/memory_utils.h b/src/lxc/memory_utils.h
index fb9e1ae4e..fcc51b478 100644
--- a/src/lxc/memory_utils.h
+++ b/src/lxc/memory_utils.h
@@ -50,10 +50,12 @@ define_cleanup_function(FILE *, fclose);
 define_cleanup_function(DIR *, closedir);
 #define __do_closedir call_cleaner(closedir)
 
-#define free_disarm(ptr)    \
-	({                  \
-		free(ptr);  \
-		ptr = NULL; \
+#define free_disarm(ptr)                    \
+	({                                  \
+		if (!IS_ERR_OR_NULL(ptr)) { \
+			free(ptr);          \
+			ptr = NULL;         \
+		}                           \
 	})
 
 static inline void free_disarm_function(void *ptr)
@@ -64,7 +66,7 @@ static inline void free_disarm_function(void *ptr)
 
 static inline void free_string_list(char **list)
 {
-	if (list) {
+	if (list && !IS_ERR(list)) {
 		for (int i = 0; list[i]; i++)
 			free(list[i]);
 		free_disarm(list);