From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 26 Jun 2019 18:00:22 +0000 (+0900)
Subject: conf-parser: fix continuation handling
X-Git-Tag: v243-rc1~226^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ef69585d8583cd86e53195313dd08f50a0c6019;p=thirdparty%2Fsystemd.git

conf-parser: fix continuation handling

Before this commit, empty lines cannot break continuation.
The bug was introduced by 9adbfeb38ac101d6f73a033bb120d63513ffb240.

Closes #12883.
---

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 2df09edaf57..f45dd798b21 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -322,7 +322,8 @@ int config_parse(const char *unit,
                         return r;
                 }
 
-                if (strchr(COMMENTS, *skip_leading_chars(buf, WHITESPACE)))
+                l = skip_leading_chars(buf, WHITESPACE);
+                if (*l != '\0' && strchr(COMMENTS, *l))
                         continue;
 
                 l = buf;