From a56dd1580d8a1324ea0dc9b4706e47d2df56535c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 18 Oct 2022 20:08:39 +0900 Subject: [PATCH] string-util: make free_and_strdup_warn() return 1 when new string is assigned --- src/basic/string-util.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/basic/string-util.h b/src/basic/string-util.h index 0703c848f0..46681ced99 100644 --- a/src/basic/string-util.h +++ b/src/basic/string-util.h @@ -171,9 +171,12 @@ int split_pair(const char *s, const char *sep, char **l, char **r); int free_and_strdup(char **p, const char *s); static inline int free_and_strdup_warn(char **p, const char *s) { - if (free_and_strdup(p, s) < 0) + int r; + + r = free_and_strdup(p, s); + if (r < 0) return log_oom(); - return 0; + return r; } int free_and_strndup(char **p, const char *s, size_t l); -- 2.25.1