From dc1cd36b379c5aea1959f0b31c7f322bc59f432e Mon Sep 17 00:00:00 2001
From: wwp <subscript@free.fr>
Date: Wed, 6 Oct 2021 12:04:33 +0200
Subject: [PATCH] Fix CID 1491290: dereference before null check.

---
 src/addressbook.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/addressbook.c b/src/addressbook.c
index 17830ffa3..7ee74f66f 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -3639,10 +3639,12 @@ gchar *addressbook_set_col_name_guard(gchar *value)
 {
 	gchar *ret = "<not set>";
 	gchar *tmp = g_strdup(value);
-	g_strstrip(tmp);
-	if (tmp !=NULL && *tmp != '\0')
-		ret = value;
-	g_free(tmp);
+	if (tmp) {
+		g_strstrip(tmp);
+		if (*tmp != '\0')
+			ret = value;
+		g_free(tmp);
+	}
 	return ret;
 }
 
-- 
2.25.1