Belac/squashfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 55 Wiki Activity

Fix frag, id, inode table values on block boundries

Browse Source 
Fixes bug mention in #30
This commit is contained in:
Caleb Gardner
2024-11-26 17:09:39 -06:00
parent 0f8a4e0027
commit 03266d0560
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
low/reader.go
+5 -3
View File
@@ -3,6 +3,7 @@ package squashfslow
import (
"encoding/binary"
"errors"
"fmt"
"io"
"math"
@@ -88,7 +89,7 @@ func (r *Reader) Id(i uint16) (uint32, error) {
// Populate the id table as needed
var blockNum uint32
if i != 0 { // If i == 0, we go negatives causing issues with uint32s
blockNum = uint32(math.Ceil(float64(i)/2048)) - 1
blockNum = uint32(math.Ceil(float64(i+1)/2048)) - 1
} else {
blockNum = 0
}
@@ -131,10 +132,11 @@ func (r *Reader) fragEntry(i uint32) (fragEntry, error) {
// Populate the fragment table as needed
var blockNum uint32
if i != 0 { // If i == 0, we go negatives causing issues with uint32s
blockNum = uint32(math.Ceil(float64(i)/512)) - 1
blockNum = uint32(math.Ceil(float64(i+1)/512)) - 1
} else {
blockNum = 0
}
fmt.Println(blockNum)
blocksRead := len(r.fragTable) / 512
blocksToRead := int(blockNum) - blocksRead + 1
@@ -177,7 +179,7 @@ func (r *Reader) inodeRef(i uint32) (uint64, error) {
// Populate the export table as needed
var blockNum uint32
if i != 0 { // If i == 0, we go negatives causing issues with uint32s
blockNum = uint32(math.Ceil(float64(i)/1024)) - 1
blockNum = uint32(math.Ceil(float64(i+1)/1024)) - 1
} else {
blockNum = 0
}