From 6407ddf4dac667258fdc16a71a500bccd211e76e Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Sat, 20 Feb 2021 03:17:10 +0100 Subject: [PATCH] memory_utils: adapt to new pointer error macros Signed-off-by: Christian Brauner --- src/lxc/memory_utils.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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); -- 2.47.2