forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 06:36:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

triedb/pathdb: improve the parseIndexBlock

Browse source 
Signed-off-by: jsvisa <delweng@gmail.com>
This commit is contained in:
jsvisa 2025-07-16 16:37:07 +08:00
parent e44cc0654f
commit 2d605aa2d3
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
triedb/pathdb/history_index_block.go
View file

@ -116,34 +116,31 @@ func parseIndexBlock(blob []byte) ([]uint16, []byte, error) {
if len(blob) < 1 { if len(blob) < 1 {
return nil, nil, fmt.Errorf("corrupted index block, len: %d", len(blob)) return nil, nil, fmt.Errorf("corrupted index block, len: %d", len(blob))
} }
restartLen := blob[len(blob)-1] restartLen := int(blob[len(blob)-1])
if restartLen == 0 { if restartLen == 0 {
return nil, nil, errors.New("corrupted index block, no restart") return nil, nil, errors.New("corrupted index block, no restart")
} }
tailLen := int(restartLen)*2 + 1 tailLen := restartLen*2 + 1
if len(blob) < tailLen { if len(blob) < tailLen {
return nil, nil, fmt.Errorf("truncated restarts, size: %d, restarts: %d", len(blob), restartLen) return nil, nil, fmt.Errorf("truncated restarts, size: %d, restarts: %d", len(blob), restartLen)
} }
restarts := make([]uint16, 0, restartLen) restarts := make([]uint16, restartLen)
for i := int(restartLen); i > 0; i-- { dataEnd := len(blob) - tailLen
restart := binary.BigEndian.Uint16(blob[len(blob)-1-2*i:])
restarts = append(restarts, restart) // Extract and validate that restart points are strictly ordered and within the valid
}
// Validate that restart points are strictly ordered and within the valid
// data range. // data range.
var prev uint16 for i := 0; i < restartLen; i++ {
for i := 0; i < len(restarts); i++ { off := dataEnd + 2*i
if i != 0 { restarts[i] = binary.BigEndian.Uint16(blob[off : off+2])
if restarts[i] <= prev {
return nil, nil, fmt.Errorf("restart out of order, prev: %d, next: %d", prev, restarts[i]) if i > 0 && restarts[i] <= restarts[i-1] {
return nil, nil, fmt.Errorf("restart out of order, prev: %d, next: %d", restarts[i-1], restarts[i])
}
if int(restarts[i]) >= dataEnd {
return nil, nil, fmt.Errorf("invalid restart position, restart: %d, size: %d", restarts[i], dataEnd)
} }
} }
if int(restarts[i]) >= len(blob)-tailLen { return restarts, blob[:dataEnd], nil
return nil, nil, fmt.Errorf("invalid restart position, restart: %d, size: %d", restarts[i], len(blob)-tailLen)
}
prev = restarts[i]
}
return restarts, blob[:len(blob)-tailLen], nil
} }
// blockReader is the reader to access the element within a block. // blockReader is the reader to access the element within a block.