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

eth: fix potential rpc.BlockNumber overflow, close XFN-69 (#1736)

Browse source
This commit is contained in:
Daniel Liu 2025-11-15 19:13:01 +08:00 committed by benjamin202410
parent f9d8738f2a
commit 5b56e97be7
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
eth/api_tracer.go
View file

@ -141,6 +141,9 @@ func (api *PrivateDebugAPI) TraceChain(ctx context.Context, start, end rpc.Block
case rpc.LatestBlockNumber: case rpc.LatestBlockNumber:
from = api.eth.blockchain.CurrentBlock() from = api.eth.blockchain.CurrentBlock()
default: default:
if start.Int64() < 0 {
return nil, fmt.Errorf("invalid start block number %d", start.Int64())
}
from = api.eth.blockchain.GetBlockByNumber(uint64(start)) from = api.eth.blockchain.GetBlockByNumber(uint64(start))
} }
switch end { switch end {
@ -149,17 +152,20 @@ func (api *PrivateDebugAPI) TraceChain(ctx context.Context, start, end rpc.Block
case rpc.LatestBlockNumber: case rpc.LatestBlockNumber:
to = api.eth.blockchain.CurrentBlock() to = api.eth.blockchain.CurrentBlock()
default: default:
if end.Int64() < 0 {
return nil, fmt.Errorf("invalid end block number %d", end.Int64())
}
to = api.eth.blockchain.GetBlockByNumber(uint64(end)) to = api.eth.blockchain.GetBlockByNumber(uint64(end))
} }
// Trace the chain if we've found all our blocks // Trace the chain if we've found all our blocks
if from == nil { if from == nil {
return nil, fmt.Errorf("starting block #%d not found", start) return nil, fmt.Errorf("not find start block %d", start.Int64())
} }
if to == nil { if to == nil {
return nil, fmt.Errorf("end block #%d not found", end) return nil, fmt.Errorf("not find end block %d", end.Int64())
} }
if from.Number().Cmp(to.Number()) >= 0 { if from.Number().Cmp(to.Number()) >= 0 {
return nil, fmt.Errorf("end block (#%d) needs to come after start block (#%d)", end, start) return nil, fmt.Errorf("wrong parameter order: start(%d) >= end(%d)", start.Int64(), end.Int64())
} }
return api.traceChain(ctx, from, to, config) return api.traceChain(ctx, from, to, config)
} }
@ -403,6 +409,9 @@ func (api *PrivateDebugAPI) TraceBlockByNumber(ctx context.Context, number rpc.B
case rpc.LatestBlockNumber: case rpc.LatestBlockNumber:
block = api.eth.blockchain.CurrentBlock() block = api.eth.blockchain.CurrentBlock()
default: default:
if number.Int64() < 0 {
return nil, fmt.Errorf("invalid block number %d", number.Int64())
}
block = api.eth.blockchain.GetBlockByNumber(uint64(number)) block = api.eth.blockchain.GetBlockByNumber(uint64(number))
} }
// Trace the block if it was found // Trace the block if it was found