diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-08-18 00:11:58 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-18 00:11:58 +0900 |
| commit | cb63114880683f31ef5eea1b3bc1dbba5635f6cb (patch) | |
| tree | 644d29ccfe664c375ea1cd6b006cfcf65f8301c2 | |
| parent | 9e5f34a639f643456b9ed43974b59c620ef4fc34 (diff) | |
| parent | 670e95aecda39c49a9ae9c2544203b628ed34d8b (diff) | |
| download | systemd-cb63114880683f31ef5eea1b3bc1dbba5635f6cb.tar.gz | |
Merge pull request #9879 from evverx/get-rid-of-workaround
oss-fuzz.sh: just install the shared library
| -rw-r--r-- | src/resolve/resolvectl.c | 2 | ||||
| -rwxr-xr-x | tools/oss-fuzz.sh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c index f8372d5e83..1ac4683c5f 100644 --- a/src/resolve/resolvectl.c +++ b/src/resolve/resolvectl.c @@ -919,7 +919,7 @@ static int resolve_openpgp(sd_bus *bus, const char *address) { arg_type ?: DNS_TYPE_OPENPGPKEY, false); if (IN_SET(r, -ENXIO, -ESRCH)) { /* NXDOMAIN or NODATA? */ - hashed = NULL; + hashed = mfree(hashed); r = string_hashsum_sha224(address, domain - 1 - address, &hashed); if (r < 0) return log_error_errno(r, "Hashing failed: %m"); diff --git a/tools/oss-fuzz.sh b/tools/oss-fuzz.sh index 200407fcca..2db5b4cc44 100755 --- a/tools/oss-fuzz.sh +++ b/tools/oss-fuzz.sh @@ -44,8 +44,7 @@ df=$build/dns-fuzzing git clone --depth 1 https://github.com/CZ-NIC/dns-fuzzing $df zip -jqr $OUT/fuzz-dns-packet_seed_corpus.zip $df/packet -# install the private shared library without executable permissions -install -Dt $OUT/src/shared/ -m 0644 $build/src/shared/libsystemd-shared-*.so +install -Dt $OUT/src/shared/ $build/src/shared/libsystemd-shared-*.so find $build -maxdepth 1 -type f -executable -name "fuzz-*" -exec mv {} $OUT \; cp src/fuzz/*.options $OUT |