From 8a37ce6545133af34047db8e0dd02950cf6cb843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 21 Mar 2018 13:15:01 +0100
Subject: [PATCH 1/2] shared/conf-parser: fix outdated comment

---
 src/shared/conf-parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index e7c901f761..72c47150d0 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -165,7 +165,7 @@ static int next_assignment(
         return 0;
 }
 
-/* Parse a variable assignment line */
+/* Parse a single logical line */
 static int parse_line(
                 const char* unit,
                 const char *filename,

From af3865abf1826894b582ae763f59418cafd4f7c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 21 Mar 2018 13:16:25 +0100
Subject: [PATCH 2/2] fuzz-unit-file: fix check if ListenNetlink is used

A line may contain leading spaces which we should skip.
Fixes https://oss-fuzz.com/v2/issue/5546208027213824/7049.
---
 src/fuzz/fuzz-unit-file.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/fuzz/fuzz-unit-file.c b/src/fuzz/fuzz-unit-file.c
index 44c68db64d..4865653f5b 100644
--- a/src/fuzz/fuzz-unit-file.c
+++ b/src/fuzz/fuzz-unit-file.c
@@ -41,11 +41,14 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 
         for (;;) {
                 _cleanup_free_ char *l = NULL;
+                const char *ll;
 
                 if (read_line(f, LINE_MAX, &l) <= 0)
                         break;
 
-                if (startswith(l, "ListenNetlink="))
+                ll = l + strspn(l, WHITESPACE);
+
+                if (startswith(ll, "ListenNetlink="))
                         /* ListenNetlink causes a false positive in msan,
                          * let's skip this for now. */
                         return 0;