From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 13 Feb 2013 14:55:32 +0000 (-0500)
Subject: sysctl: fix uninitalized memory access in error path
X-Git-Tag: v198~269
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f04e95ba6b861fc7d00e16d3d912a01aa7d286de

sysctl: fix uninitalized memory access in error path

src/sysctl/sysctl.c: In function ‘parse_file’:
src/sysctl/sysctl.c:172:41: warning: ‘property’ may be used uninitialized in this function [-Wmaybe-uninitialized]
---

diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index f59a85832..a8cbb5a32 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -169,7 +169,8 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
                 existing = hashmap_get(sysctl_options, p);
                 if (existing) {
                         if (!streq(value, existing))
-                                log_warning("Two ore more conflicting assignments of %s, ignoring.", property);
+                                log_warning("Duplicate assignment of %s in file '%s', ignoring.",
+                                            p, path);
 
                         continue;
                 }