Fix Coverity findings (#13)

4 files changed, 25 insertions, 7 deletions

diff --git a/src/tests/config-env-test.c b/src/tests/config-env-test.c
index 91edeb4..2c780d2 100644
--- a/src/tests/config-env-test.c
+++ b/src/tests/config-env-test.c
@@ -62,7 +62,11 @@ test_config_env (void)
     ConfigEnvTest test = config_env_test_set[idx];
 
     /* Set proxy environment variable. Must be done before px_test_manager_new()! */
-    g_setenv (test.env, test.proxy, TRUE);
+    if (!g_setenv (test.env, test.proxy, TRUE)) {
+      g_warning ("Could not set environment");
+      continue;
+    }
+
     if (test.no_proxy)
       g_setenv ("NO_PROXY", test.no_proxy, TRUE);
 
diff --git a/src/tests/config-sysconfig-test.c b/src/tests/config-sysconfig-test.c
index 099f7a8..1a2d3ec 100644
--- a/src/tests/config-sysconfig-test.c
+++ b/src/tests/config-sysconfig-test.c
@@ -49,7 +49,10 @@ test_config_sysconfig (void)
     ConfigSysConfigTest test = config_sysconfig_test_set[idx];
     g_autofree char *path = g_test_build_filename (G_TEST_DIST, "data", "sample-sysconfig-proxy", NULL);
 
-    g_setenv ("PX_CONFIG_SYSCONFIG", path, TRUE);
+    if (!g_setenv ("PX_CONFIG_SYSCONFIG", path, TRUE)) {
+      g_warning ("Failed to set sysconfig environment");
+      continue;
+    }
 
     manager = px_test_manager_new ("config-sysconfig");
     g_clear_error (&error);
diff --git a/src/tests/meson.build b/src/tests/meson.build
index d745d7e..fcdd75c 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -47,7 +47,7 @@ if get_option('tests')
       include_directories: px_backend_inc,
       dependencies: [glib_dep, px_backend_dep],
     )
-    test('Config GNOMEtest',
+    test('Config GNOME test',
          config_gnome_test,
          env: [envs, 'XDG_CURRENT_DESKTOP=GNOME'],
     )
diff --git a/src/tests/px-manager-test.c b/src/tests/px-manager-test.c
index 20db7c6..5cb16c3 100644
--- a/src/tests/px-manager-test.c
+++ b/src/tests/px-manager-test.c
@@ -43,9 +43,13 @@ server_callback (SoupServer *server,
   if (g_strcmp0 (path, "/test.pac") == 0) {
     g_autofree char *pac = g_test_build_filename (G_TEST_DIST, "data", "px-manager-sample.pac", NULL);
     g_autofree char *pac_data = NULL;
+    g_autoptr (GError) error = NULL;
     gsize len;
 
-    g_file_get_contents (pac, &pac_data, &len, NULL);
+    if (!g_file_get_contents (pac, &pac_data, &len, &error)) {
+        g_warning ("Could not read pac file: %s", error ? error->message : "");
+        return;
+    }
     soup_server_message_set_response (msg, "text/plain", SOUP_MEMORY_COPY, pac_data, len);
   }
 }
@@ -58,7 +62,10 @@ fixture_setup (Fixture       *fixture,
 
   if (data) {
     g_autofree char *path = g_test_build_filename (G_TEST_DIST, "data", data, NULL);
-    g_setenv ("PX_CONFIG_SYSCONFIG", path, TRUE);
+    if (!g_setenv ("PX_CONFIG_SYSCONFIG", path, TRUE)) {
+      g_warning ("Failed to set environment");
+      return;
+    }
   }
 
   fixture->manager = px_test_manager_new ("config-sysconfig");
@@ -90,7 +97,9 @@ static void
 test_pac_download (Fixture    *self,
                    const void *user_data)
 {
-  g_thread_new ("test", (GThreadFunc)download_pac, self);
+  g_autoptr (GThread) thread = NULL;
+
+  thread = g_thread_new ("test", (GThreadFunc)download_pac, self);
   g_main_loop_run (self->loop);
 }
 
@@ -143,7 +152,9 @@ static void
 test_get_proxies_pac (Fixture    *self,
                       const void *user_data)
 {
-  g_thread_new ("test", (GThreadFunc)get_proxies_pac, self);
+  g_autoptr (GThread) thread = NULL;
+
+  thread = g_thread_new ("test", (GThreadFunc)get_proxies_pac, self);
   g_main_loop_run (self->loop);
 }