mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-21 20:26:41 +00:00
trie/bintrie: fix panic in code chunk key computation for chunknr=0
When chunknr is zero, codeOffset+chunknr encodes to a single byte. The short slice caused getBinaryTreeKey to panic on offset[:31]. Zero-pad the offset to 32 bytes before hashing.
This commit is contained in:
parent
7e625dd548
commit
51e023800e
2 changed files with 36 additions and 1 deletions
|
|
@ -105,7 +105,8 @@ func GetBinaryTreeKeyStorageSlot(address common.Address, slotnum []byte) []byte
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetBinaryTreeKeyCodeChunk(address common.Address, chunknr *uint256.Int) []byte {
|
func GetBinaryTreeKeyCodeChunk(address common.Address, chunknr *uint256.Int) []byte {
|
||||||
chunkOffset := new(uint256.Int).Add(codeOffset, chunknr).Bytes()
|
chunkOffsetBytes32 := new(uint256.Int).Add(codeOffset, chunknr).Bytes32()
|
||||||
|
chunkOffset := chunkOffsetBytes32[:]
|
||||||
return GetBinaryTreeKey(address, chunkOffset)
|
return GetBinaryTreeKey(address, chunkOffset)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
34
trie/bintrie/key_encoding_test.go
Normal file
34
trie/bintrie/key_encoding_test.go
Normal file
|
|
@ -0,0 +1,34 @@
|
||||||
|
// Copyright 2025 go-ethereum Authors
|
||||||
|
// This file is part of the go-ethereum library.
|
||||||
|
//
|
||||||
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public License
|
||||||
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package bintrie
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/ethereum/go-ethereum/common"
|
||||||
|
"github.com/holiman/uint256"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestGetBinaryTreeKeyCodeChunkZero is a regression test: chunknr=0 encodes
|
||||||
|
// codeOffset (128) to a single byte, which caused getBinaryTreeKey to panic on
|
||||||
|
// offset[:31] before the offset was zero-padded to 32 bytes.
|
||||||
|
func TestGetBinaryTreeKeyCodeChunkZero(t *testing.T) {
|
||||||
|
key := GetBinaryTreeKeyCodeChunk(common.Address{}, uint256.NewInt(0))
|
||||||
|
if len(key) != 32 {
|
||||||
|
t.Fatalf("expected 32-byte key, got %d", len(key))
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue