[Commits] [SCM] claws branch, master, updated. 3.18.0-262-gdc1cd36b3

[wwp at claws-mail.org]

The branch, master has been updated
       via  dc1cd36b379c5aea1959f0b31c7f322bc59f432e (commit)
      from  3d29bbb7dfa9914a0a671251ae9b8ee971b1f998 (commit)

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


- Log -----------------------------------------------------------------
commit dc1cd36b379c5aea1959f0b31c7f322bc59f432e
Author: wwp <subscript at free.fr>
Date:   Wed Oct 6 12:04:33 2021 +0200

    Fix CID 1491290: dereference before null check.

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;
 }
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail