Remove sed for internal/fuzz/helpers.go

No idea if this is supposed to go before or after.
klauspost · Feb 26, 2024 · d7617b1 · d7617b1
1 parent 46c00ca
commit d7617b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/internal/fuzz/helpers.go b/internal/fuzz/helpers.go
@@ -41,6 +41,9 @@ func AddFromZip(f *testing.F, filename string, t InputType, short bool) {
 	if err != nil {
 		f.Fatal(err)
 	}
+	if fi == nil {
+		return
+	}
 	zr, err := zip.NewReader(file, fi.Size())
 	if err != nil {
 		f.Fatal(err)
@@ -102,6 +105,9 @@ func ReturnFromZip(tb testing.TB, filename string, t InputType, fn func([]byte))
 	if err != nil {
 		tb.Fatal(err)
 	}
+	if fi == nil {
+		return
+	}
 	zr, err := zip.NewReader(file, fi.Size())
 	if err != nil {
 		tb.Fatal(err)

diff --git 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
+cp -r $SRC/compress/testdata $OUT