diff options
| author |  Runxi Yu | 2026-03-05 21:09:07 +0800 |
|---|---|---|
| committer | Runxi Yu | 2026-03-05 21:14:24 +0800 |
| commit | 355f5b3dc9ae560827cd274e113f43d09ee9ac49 (patch) | |
| tree | 2046f5d51110fff82aecf35c75884222f51ac36c /internal/compress/zlib/reader_reset.go | |
| parent | objectid, format/pack/ingest: Pack hash ID in algo (diff) | |
| signature | No signature | |
*: Fix overflows
Diffstat (limited to 'internal/compress/zlib/reader_reset.go')
| -rw-r--r-- | internal/compress/zlib/reader_reset.go | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/internal/compress/zlib/reader_reset.go b/internal/compress/zlib/reader_reset.go index 32af0b49..3e78ab5d 100644 --- a/internal/compress/zlib/reader_reset.go +++ b/internal/compress/zlib/reader_reset.go @@ -12,6 +12,7 @@ import ( "codeberg.org/lindenii/furgit/internal/adler32" "codeberg.org/lindenii/furgit/internal/compress/flate" + "codeberg.org/lindenii/furgit/internal/intconv" ) // reset resets receiver to read a new zlib stream. @@ -29,7 +30,14 @@ func (z *Reader) reset(r io.Reader, dict []byte) error { // Read the header (RFC 1950 section 2.2.). readN, err := io.ReadFull(z.r, z.scratch[0:2]) - z.headerRead += uint64(readN) + readNUint64, convErr := intconv.IntToUint64(readN) + if convErr != nil { + z.err = convErr + + return z.err + } + + z.headerRead += readNUint64 z.err = err if z.err != nil { @@ -51,7 +59,14 @@ func (z *Reader) reset(r io.Reader, dict []byte) error { if haveDict { readN, z.err = io.ReadFull(z.r, z.scratch[0:4]) - z.headerRead += uint64(readN) + readNUint64, err := intconv.IntToUint64(readN) + if err != nil { + z.err = err + + return z.err + } + + z.headerRead += readNUint64 if z.err != nil { if errors.Is(z.err, io.EOF) { z.err = io.ErrUnexpectedEOF |