[Commits] [SCM] claws branch, master, updated. 3.18.0-173-gcb22c1707

[wwp at claws-mail.org]

The branch, master has been updated
       via  cb22c1707da6e72655d55cbfbd7b602db959547c (commit)
      from  49bd0f5d2c870d4f0c5100dd81576f6272ffcebf (commit)

Summary of changes:
 src/stock_pixmap.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit cb22c1707da6e72655d55cbfbd7b602db959547c
Author: wwp <subscript at free.fr>
Date:   Mon Sep 27 17:57:48 2021 +0200

    Fix CID 1491190: explicit null dereference.

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 44b278a7c..d78e95a30 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -804,15 +804,21 @@ static void stock_pixmap_find_themes_in_dir(GList **list, const gchar *dirname)
 
 gchar *stock_pixmap_get_system_theme_dir_for_theme(const gchar *theme)
 {
-	const gchar *sep = NULL;
-	if (theme && *theme)
-		sep = G_DIR_SEPARATOR_S;
+	if (theme && *theme) {
 #ifndef G_OS_WIN32
-	return g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
-	        	   PIXMAP_THEME_DIR, sep, theme, NULL);
+		return g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
+	        	   PIXMAP_THEME_DIR, G_DIR_SEPARATOR_S, theme, NULL);
 #else
-	return g_strconcat(w32_get_themes_dir(), sep, theme, NULL);
+		return g_strconcat(w32_get_themes_dir(), G_DIR_SEPARATOR_S, theme, NULL);
 #endif
+	} else {
+#ifndef G_OS_WIN32
+		return g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
+	        	   PIXMAP_THEME_DIR, NULL);
+#else
+		return g_strdup(w32_get_themes_dir());
+#endif
+	}
 }
 
 GList *stock_pixmap_themes_list_new(void)

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


hooks/post-receive
-- 
Claws Mail