diff options
| -rw-r--r-- | pkg/config/config.go | 2 | ||||
| -rw-r--r-- | pkg/mgrconfig/testdata/gce1.cfg | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkg/config/config.go b/pkg/config/config.go index 9ff25ecd7..8eb43fa58 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -26,7 +26,7 @@ func LoadFile(filename string, cfg interface{}) error { func LoadData(data []byte, cfg interface{}) error { // Remove comment lines starting with #. - data = regexp.MustCompile(`(^|\n)\s*#.*?\n`).ReplaceAll(data, nil) + data = regexp.MustCompile(`(^|\n)\s*#[^\n]*`).ReplaceAll(data, nil) dec := json.NewDecoder(bytes.NewReader(data)) dec.DisallowUnknownFields() if err := dec.Decode(cfg); err != nil { 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", |