klocwork fixes

diff --git a/src/common/gum-file.c b/src/common/gum-file.c
index f501e97..e50f489 100644 (file)
--- a/src/common/gum-file.c
+++ b/src/common/gum-file.c
@@ -146,13 +146,14 @@ _copy_file_attributes (
         gchar *names = g_new0 (gchar, attrs_size + 1);
         if (names && llistxattr (from_path, names, attrs_size) > 0) {
 
-            gchar *name = NULL, *value = NULL;
+            gchar *name = names, *value = NULL;
             gchar *end_names = names + attrs_size;
             names[attrs_size] = '\0';
             gsize size = 0;
 
-            for (name = names; name != end_names; name =strchr (name,'\0')+1) {
-
+            while (name != end_names) {
+                if (name)
+                    name = strchr (name,'\0')+1;
                 if (name && (size = lgetxattr (from_path, name, NULL, 0)) > 0 &&
                         (value = g_realloc (value, size)) &&
                         lgetxattr (from_path, name, value, size) > 0) {

diff --git a/src/daemon/gumd-daemon.c b/src/daemon/gumd-daemon.c
index 9ffbf2e..ce3f1e8 100644 (file)
--- a/src/daemon/gumd-daemon.c
+++ b/src/daemon/gumd-daemon.c
@@ -262,7 +262,7 @@ GumConfig *
 gumd_daemon_get_config (
         GumdDaemon *self)
 {
-    g_return_val_if_fail (self != NULL || self->priv != NULL, NULL);
+    g_return_val_if_fail (self != NULL && self->priv != NULL, NULL);
 
     return self->priv->config;
 }