From a0df376348d2ad1d3e557ea221e75c78a5d9fd96 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sat, 17 Dec 2022 12:12:05 +0100 Subject: pkg/image: make Decompress easier to use Change DecompressWriter to DecompressCheck: checking validity of the image is the only useful use of DecompressWriter. Change Decompress to MustDecompress which does not return an error. We check validity during program deserialization, so all other uses already panic on errors. Also add dtor return value in preparation for subsequent changes. --- prog/mutation.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'prog/mutation.go') diff --git a/prog/mutation.go b/prog/mutation.go index 100c47a91..5a38cfa88 100644 --- a/prog/mutation.go +++ b/prog/mutation.go @@ -396,10 +396,8 @@ func (r *randGen) mutateImage(compressed []byte) (data []byte, retry bool) { // Reconsider when/if we move mutation to the host process. imageMu.Lock() defer imageMu.Unlock() - data, err := image.Decompress(compressed) - if err != nil { - panic(fmt.Sprintf("could not decompress data: %v", err)) - } + data, dtor := image.MustDecompress(compressed) + defer dtor() if len(data) == 0 { return compressed, true // Do not mutate empty data. } -- cgit mrf-deployment