From 1c571b255b31119be8c000448c26e3b62a9e3ceb Mon Sep 17 00:00:00 2001 From: Jan-Michael Brummer Date: Mon, 20 Mar 2023 05:18:44 -0400 Subject: Fix coverity findings (#96) Co-authored-by: Jan-Michael Brummer --- src/backend/px-manager.c | 5 +++-- src/libproxy/proxy.c | 2 +- tests/config-gnome-test.c | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/backend/px-manager.c b/src/backend/px-manager.c index 1e3bcb0..69d94fd 100644 --- a/src/backend/px-manager.c +++ b/src/backend/px-manager.c @@ -102,7 +102,8 @@ px_manager_constructed (GObject *object) g_autofree char *new_g_messages_debug = NULL; new_g_messages_debug = g_strconcat (g_messages_debug, " ", G_LOG_DOMAIN, NULL); - g_setenv ("G_MESSAGES_DEBUG", new_g_messages_debug, TRUE); + if (new_g_messages_debug) + g_setenv ("G_MESSAGES_DEBUG", new_g_messages_debug, TRUE); } } @@ -587,7 +588,7 @@ px_strv_builder_add_proxy (GStrvBuilder *builder, const char *value) { for (int idx = 0; idx < ((GPtrArray *)builder)->len; idx++) { - if (strcmp ((char *)((GPtrArray *)builder)->pdata[idx], value) == 0) + if (g_strcmp0 ((char *)((GPtrArray *)builder)->pdata[idx], value) == 0) return; } diff --git a/src/libproxy/proxy.c b/src/libproxy/proxy.c index 6a60d6b..278c0af 100644 --- a/src/libproxy/proxy.c +++ b/src/libproxy/proxy.c @@ -71,7 +71,7 @@ px_proxy_factory_get_proxies (pxProxyFactory *self, result = px_manager_get_proxies_sync (self->manager, url, &error); if (error) - g_warning ("Could not query proxy: %s", error ? error->message : ""); + g_warning ("Could not query proxy: %s", error->message); return g_steal_pointer (&result); } diff --git a/tests/config-gnome-test.c b/tests/config-gnome-test.c index 73602ad..fc688bd 100644 --- a/tests/config-gnome-test.c +++ b/tests/config-gnome-test.c @@ -169,7 +169,10 @@ test_config_gnome_fail (Fixture *self, g_autoptr (GUri) uri = NULL; /* Disable GNOME support */ - g_setenv ("XDG_CURRENT_DESKTOP", "unknown", TRUE); + if (!g_setenv ("XDG_CURRENT_DESKTOP", "unknown", TRUE)) { + g_warning ("Could not set XDG_CURRENT_DESKTOP environment, abort"); + return; + } manager = px_test_manager_new ("config-gnome", NULL); g_settings_set_enum (self->proxy_settings, "mode", GNOME_PROXY_MODE_AUTO); -- cgit v1.2.1