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.go | |
| parent | objectid, format/pack/ingest: Pack hash ID in algo (diff) | |
| signature | No signature | |
*: Fix overflows
Diffstat (limited to 'internal/compress/zlib/reader.go')
| -rw-r--r-- | internal/compress/zlib/reader.go | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/internal/compress/zlib/reader.go b/internal/compress/zlib/reader.go index a6497dec..f298a07f 100644 --- a/internal/compress/zlib/reader.go +++ b/internal/compress/zlib/reader.go @@ -41,6 +41,7 @@ import ( "sync" "codeberg.org/lindenii/furgit/internal/compress/flate" + "codeberg.org/lindenii/furgit/internal/intconv" ) const ( @@ -131,7 +132,14 @@ func (z *Reader) Read(p []byte) (int, error) { // Finished file; check checksum. readN, err := io.ReadFull(z.r, z.scratch[0:4]) - z.trailerRead += uint64(readN) + readNUint64, convErr := intconv.IntToUint64(readN) + if convErr != nil { + z.err = convErr + + return n, z.err + } + + z.trailerRead += readNUint64 if err != nil { if errors.Is(err, io.EOF) { @@ -160,7 +168,12 @@ func (z *Reader) Read(p []byte) (int, error) { func (z *Reader) InputConsumed() uint64 { out := z.headerRead + z.trailerRead if z.progress != nil { - out += uint64(z.progress.InputConsumed()) + progressIn, err := intconv.Int64ToUint64(z.progress.InputConsumed()) + if err != nil { + panic(err) + } + + out += progressIn } return out |