diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2022-12-17 12:12:05 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2022-12-22 10:11:08 +0100 |
| commit | a0df376348d2ad1d3e557ea221e75c78a5d9fd96 (patch) | |
| tree | b15ead346eb5f9f01e71dca1f4f4d1966da3e0cf /prog/encoding.go | |
| parent | 09ff16760eac2d6f03e93bd7d50892a6d536ed1b (diff) | |
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.
Diffstat (limited to 'prog/encoding.go')
| -rw-r--r-- | prog/encoding.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/prog/encoding.go b/prog/encoding.go index bfa80b983..bd2efb836 100644 --- a/prog/encoding.go +++ b/prog/encoding.go @@ -7,7 +7,6 @@ import ( "bytes" "encoding/hex" "fmt" - "io/ioutil" "reflect" "strconv" "strings" @@ -606,7 +605,7 @@ func (p *parser) parseArgString(t Type, dir Dir) (Arg, error) { } // Check compressed data for validity. if typ.IsCompressed() { - if err := image.DecompressWriter(ioutil.Discard, data); err != nil { + if err := image.DecompressCheck(data); err != nil { p.strictFailf("invalid compressed data in arg: %v", err) // In non-strict mode, empty the data slice. data = image.Compress(nil) |