From 355f5b3dc9ae560827cd274e113f43d09ee9ac49 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Thu, 5 Mar 2026 21:09:07 +0800 Subject: *: Fix overflows --- internal/compress/zlib/reader_reset.go | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'internal/compress/zlib/reader_reset.go') 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 -- cgit v1.3.1-10-gc9f91