From 6864a154c1055fe54c107f4cc8cfa1076071ad87 Mon Sep 17 00:00:00 2001 From: Steven Jackson Date: Fri, 8 Nov 2013 14:40:07 +0000 Subject: [PATCH] Fixed errors reported by cppcheck hints.c: possible NULL dereference assignment to pointer value rather than pointer xfwm4-settings.c: possible small memory leak --- settings-dialogs/xfwm4-settings.c | 4 ++-- src/hints.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/settings-dialogs/xfwm4-settings.c b/settings-dialogs/xfwm4-settings.c index aeee962..a743ec5 100644 --- a/settings-dialogs/xfwm4-settings.c +++ b/settings-dialogs/xfwm4-settings.c @@ -743,8 +743,8 @@ xfwm_settings_theme_sort_func (GtkTreeModel *model, gtk_tree_model_get (model, iter1, 0, &str1, -1); gtk_tree_model_get (model, iter2, 0, &str2, -1); - if (str1 == NULL) str1 = g_strdup (""); - if (str2 == NULL) str2 = g_strdup (""); + if (str1 == NULL) str1 = ""; + if (str2 == NULL) str2 = ""; if (g_str_equal (str1, DEFAULT_THEME)) return -1; diff --git a/src/hints.c b/src/hints.c index 45c243c..be762e9 100644 --- a/src/hints.c +++ b/src/hints.c @@ -93,9 +93,9 @@ getWMState (DisplayInfo *display_info, Window w) &real_type, &real_format, &items_read, &items_left, (unsigned char **) &data) == Success) && (items_read)) { - state = *data; if (data) { + state = *data; XFree (data); } } @@ -749,7 +749,7 @@ getUTF8String (DisplayInfo *display_info, Window w, int atom_id, gchar **str_p, TRACE ("getUTF8String() returned invalid UTF-8 characters"); g_free (*str_p); str_p = NULL; - length = 0; + *length = 0; return FALSE; } -- 1.8.3.2