aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/mgrconfig
diff options
context:
space:
mode:
authorMarco Elver <elver@google.com>2022-09-26 15:41:28 +0200
committerMarco Elver <me@marcoelver.com>2022-09-27 12:33:44 +0200
commit87840e0023f7adfb7ff928a8a5057932ea9aeab9 (patch)
tree266c5a18baf4ea1f0343ced35c6eed782b712dfa /pkg/mgrconfig
parent10323ddf71b1e5ea30453d7bf17f0815d9e0514a (diff)
pkg/config: fix comments stripping
The comment-stripping regex doesn't work for multi-line comments, because the regex looks for a substring that both starts _and_ ends with a newline character. Since a single newline cannot be used into multiple matches, only the first comment line is found and later lines are not removed resulting in a parsing error. Fix it by looking for substrings _until_ a newline.
Diffstat (limited to 'pkg/mgrconfig')
-rw-r--r--pkg/mgrconfig/testdata/gce1.cfg3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/mgrconfig/testdata/gce1.cfg b/pkg/mgrconfig/testdata/gce1.cfg
index 63320cd93..7f9d95c5d 100644
--- a/pkg/mgrconfig/testdata/gce1.cfg
+++ b/pkg/mgrconfig/testdata/gce1.cfg
@@ -3,6 +3,9 @@
# This is a test comment in the config.
"name": "windows-gce",
"target": "windows/amd64",
+ # This is a multi-line
+ # test comment in
+ # the config.
"http": ":10000",
"workdir": "/workdir",
"syzkaller": "./testdata/syzkaller",