Skip to content

squashfs: properly handle filecopy and blocksize #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deitch merged 1 commit into from
Mar 19, 2026
Merged

squashfs: properly handle filecopy and blocksize #348

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions filesystem/squashfs/finalize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,22 +380,22 @@ func copyFileData(from backend.File, to backend.WritableFile, fromOffset, toOffs

// compress the block if needed
isCompressed := false
outBuf := buf[:n]
if c != nil {
out, err := c.compress(buf)
if err != nil {
return 0, 0, nil, fmt.Errorf("error compressing block: %v", err)
}
if len(out) < len(buf) {
isCompressed = true
buf = out
n = len(out)
outBuf = out
}
}
blocks = append(blocks, &blockData{size: uint32(len(buf)), compressed: isCompressed})
if _, err := to.WriteAt(buf[:n], toOffset+int64(compressed)); err != nil {
blocks = append(blocks, &blockData{size: uint32(len(outBuf)), compressed: isCompressed})
if _, err := to.WriteAt(outBuf, toOffset+int64(compressed)); err != nil {
return raw, compressed, blocks, err
}
compressed += len(buf)
compressed += len(outBuf)
}
return raw, compressed, blocks, nil
}
Expand Down
Loading