diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-03-21 15:26:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-21 15:26:25 +0100 |
| commit | b85aca4f9218adf52f6c09d490f189d59b4dacd5 (patch) | |
| tree | f5900d24aaa861578d27567244cf2a462535d4eb /src | |
| parent | 100d5f6ee6ec53ecc20160cd4d6656cacf57db4f (diff) | |
| parent | af3865abf1826894b582ae763f59418cafd4f7c2 (diff) | |
| download | systemd-b85aca4f9218adf52f6c09d490f189d59b4dacd5.tar.gz | |
Merge pull request #8523 from keszybz/oss-fuzz-fixes
A fix for oss-fuzz msan ListenNetlink workaround
Diffstat (limited to 'src')
| -rw-r--r-- | src/fuzz/fuzz-unit-file.c | 5 | ||||
| -rw-r--r-- | src/shared/conf-parser.c | 2 |
2 files changed, 5 insertions, 2 deletions
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; 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, |