From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 28 May 2020 21:34:24 +0000 (+0200)
Subject: xdg-autostart: fix two coverity found issues
X-Git-Tag: v246-rc1~259^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F15956%2Fhead;p=thirdparty%2Fsystemd.git

xdg-autostart: fix two coverity found issues

Fixes: CID#1429003
Fixes: CID#1429004
---

diff --git a/src/fuzz/fuzz-xdg-desktop.c b/src/fuzz/fuzz-xdg-desktop.c
index 8c6472bee59..f8a1b5b28b2 100644
--- a/src/fuzz/fuzz-xdg-desktop.c
+++ b/src/fuzz/fuzz-xdg-desktop.c
@@ -30,8 +30,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 
         assert_se(service = xdg_autostart_service_parse_desktop(name));
         assert_se(service->name = strdup("fuzz-xdg-desktop.service"));
-        if (service)
-                (void) xdg_autostart_service_generate_unit(service, tmpdir);
+        (void) xdg_autostart_service_generate_unit(service, tmpdir);
 
         return 0;
 }
diff --git a/src/xdg-autostart-generator/xdg-autostart-service.c b/src/xdg-autostart-generator/xdg-autostart-service.c
index 9ff80c5bb04..c99b6cc8839 100644
--- a/src/xdg-autostart-generator/xdg-autostart-service.c
+++ b/src/xdg-autostart-generator/xdg-autostart-service.c
@@ -73,7 +73,6 @@ static int xdg_config_parse_bool(
                 void *userdata) {
 
         bool *b = data;
-        const char *value;
 
         assert(filename);
         assert(lvalue);
@@ -85,7 +84,7 @@ static int xdg_config_parse_bool(
         else if (streq(rvalue, "false"))
                 *b = false;
         else
-                return log_syntax(unit, LOG_ERR, filename, line, SYNTHETIC_ERRNO(EINVAL), "Invalid value for boolean: %s", value);
+                return log_syntax(unit, LOG_ERR, filename, line, SYNTHETIC_ERRNO(EINVAL), "Invalid value for boolean: %s", rvalue);
 
         return 0;
 }