From 4d78e54b0172386e9eee40a7428f26678e94af96 Mon Sep 17 00:00:00 2001 From: Klaus Post Date: Mon, 26 Feb 2024 07:15:33 -0800 Subject: [PATCH] Remove sed for internal/fuzz/helpers.go (#933) No idea if this is supposed to go before or after. --- internal/fuzz/helpers.go | 7 +++++++ ossfuzz/ossfuzz.sh | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/internal/fuzz/helpers.go b/internal/fuzz/helpers.go index ee685b7109..ff32ce49cf 100644 --- a/internal/fuzz/helpers.go +++ b/internal/fuzz/helpers.go @@ -38,6 +38,10 @@ func AddFromZip(f *testing.F, filename string, t InputType, short bool) { f.Fatal(err) } fi, err := file.Stat() + if fi == nil { + return + } + if err != nil { f.Fatal(err) } @@ -99,6 +103,9 @@ func ReturnFromZip(tb testing.TB, filename string, t InputType, fn func([]byte)) tb.Fatal(err) } fi, err := file.Stat() + if fi == nil { + return + } if err != nil { tb.Fatal(err) } diff --git a/ossfuzz/ossfuzz.sh b/ossfuzz/ossfuzz.sh index 7df263b8c7..c785776356 100755 --- a/ossfuzz/ossfuzz.sh +++ b/ossfuzz/ossfuzz.sh @@ -34,8 +34,6 @@ cp $SRC/compress/zstd/fuzzDicts.go $OUT/ cd $SRC/compress # Modify some files. This would be better done upstream. -sed -i '38 a\ - if fi == nil { return }' $SRC/compress/internal/fuzz/helpers.go printf "package compress\nimport _ \"github.com/AdamKorcz/go-118-fuzz-build/testing\"\n" > registerfuzzdependency.go sed -i 's/zr := testCreateZipReader/\/\/zr := testCreateZipReader/g' "${SRC}"/compress/zstd/fuzz_test.go sed -i 's/dicts = readDicts(f, zr)/dicts = fuzzDicts/g' "${SRC}"/compress/zstd/fuzz_test.go @@ -93,4 +91,4 @@ cp -r $SRC/compress/s2/testdata $OUT/ cp -r $SRC/compress/fse/testdata $OUT/ cp -r $SRC/compress/snappy/xerial/testdata $OUT/ cp -r $SRC/compress/huff0/testdata $OUT/ -cp -r $SRC/compress/testdata $OUT \ No newline at end of file +cp -r $SRC/compress/testdata $OUT