aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Runxi Yu2026-03-05 21:22:08 +0800
committerGravatar Runxi Yu2026-03-05 21:22:08 +0800
commit2278d9d296aa7ec37f0c648df1461e4ec77e219a (patch)
tree915ceb8cbb8e3cef118463073d434a3582a63952
parentformat/pack/ingest: Fix exhaustive (diff)
signatureNo signature
*: Fix wsl_v5 again
-rw-r--r--format/pack/ingest/idx_write.go1
-rw-r--r--format/pack/ingest/resolve.go1
-rw-r--r--format/pack/ingest/thin_fix.go3
-rw-r--r--internal/compress/zlib/reader.go1
-rw-r--r--internal/compress/zlib/reader_reset.go1
-rw-r--r--internal/compress/zlib/writer_test.go4
6 files changed, 11 insertions, 0 deletions
diff --git a/format/pack/ingest/idx_write.go b/format/pack/ingest/idx_write.go
index 904afb6c..730548aa 100644
--- a/format/pack/ingest/idx_write.go
+++ b/format/pack/ingest/idx_write.go
@@ -95,6 +95,7 @@ func writeIdx(state *ingestState) error {
}
word := 0x80000000 | largeOffsetIdx
+
largeOffsets = append(largeOffsets, offset)
binary.BigEndian.PutUint32(scratch[:4], word)
diff --git a/format/pack/ingest/resolve.go b/format/pack/ingest/resolve.go
index 2347dbd5..7426e52d 100644
--- a/format/pack/ingest/resolve.go
+++ b/format/pack/ingest/resolve.go
@@ -248,6 +248,7 @@ func inflateRecordPayload(state *ingestState, idx int) ([]byte, error) {
compressedOffset := record.offset + uint64(record.headerLen)
compressedLen := record.packedLen - uint64(record.headerLen)
+
compressedOffsetInt64, err := intconv.Uint64ToInt64(compressedOffset)
if err != nil {
return nil, err
diff --git a/format/pack/ingest/thin_fix.go b/format/pack/ingest/thin_fix.go
index 6ac3c75a..5883ac23 100644
--- a/format/pack/ingest/thin_fix.go
+++ b/format/pack/ingest/thin_fix.go
@@ -187,6 +187,7 @@ func (writer *countingWriter) Write(src []byte) (int, error) {
// rewritePackHeaderAndTrailer rewrites object count and trailer hash using ReadAt/WriteAt.
func rewritePackHeaderAndTrailer(state *ingestState) error {
var countRaw [4]byte
+
recordCountUint32, err := intconv.IntToUint32(len(state.records))
if err != nil {
return err
@@ -252,6 +253,7 @@ func rewritePackHeaderAndTrailer(state *ingestState) error {
state.objectCountHeader = recordCountUint32
sumLenInt64 := int64(len(sum))
+
newConsumed, err := intconv.Int64ToUint64(endWithoutTrailer + sumLenInt64)
if err != nil {
return err
@@ -267,6 +269,7 @@ func encodePackEntryHeader(ty objecttype.Type, size int64) []byte {
var out [16]byte
n := 0
+
s, err := intconv.Int64ToUint64(size)
if err != nil {
panic(err)
diff --git a/internal/compress/zlib/reader.go b/internal/compress/zlib/reader.go
index f298a07f..3cf0066e 100644
--- a/internal/compress/zlib/reader.go
+++ b/internal/compress/zlib/reader.go
@@ -132,6 +132,7 @@ func (z *Reader) Read(p []byte) (int, error) {
// Finished file; check checksum.
readN, err := io.ReadFull(z.r, z.scratch[0:4])
+
readNUint64, convErr := intconv.IntToUint64(readN)
if convErr != nil {
z.err = convErr
diff --git a/internal/compress/zlib/reader_reset.go b/internal/compress/zlib/reader_reset.go
index 3e78ab5d..fbcaccac 100644
--- a/internal/compress/zlib/reader_reset.go
+++ b/internal/compress/zlib/reader_reset.go
@@ -30,6 +30,7 @@ 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])
+
readNUint64, convErr := intconv.IntToUint64(readN)
if convErr != nil {
z.err = convErr
diff --git a/internal/compress/zlib/writer_test.go b/internal/compress/zlib/writer_test.go
index e7d73c21..b2bbd6be 100644
--- a/internal/compress/zlib/writer_test.go
+++ b/internal/compress/zlib/writer_test.go
@@ -32,6 +32,7 @@ func testFileLevelDict(t *testing.T, fn string, level int, d string) {
return
}
+
defer func() {
err := golden.Close()
if err != nil {
@@ -58,6 +59,7 @@ func testLevelDict(t *testing.T, fn string, b0 []byte, level int, d string) {
// Push data through a pipe that compresses at the write end, and decompresses at the read end.
piper, pipew := io.Pipe()
+
defer func() {
err := piper.Close()
if err != nil {
@@ -79,6 +81,7 @@ func testLevelDict(t *testing.T, fn string, b0 []byte, level int, d string) {
return
}
+
defer func() {
err := zlibw.Close()
if err != nil {
@@ -100,6 +103,7 @@ func testLevelDict(t *testing.T, fn string, b0 []byte, level int, d string) {
return
}
+
defer func() {
err := zlibr.Close()
if err != nil {