forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/vm: move fix for JUMPF

Browse source
This commit is contained in:
Marius van der Wijden 2024-09-06 12:31:40 +02:00
parent 658e4e5559
commit cd7f772ab9
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/vm/validate.go
View file

@ -120,10 +120,8 @@ func validateCode(code []byte, section int, container *Container, jt *JumpTable,
if arg >= len(container.Types) { if arg >= len(container.Types) {
return nil, fmt.Errorf("%w: arg %d, last %d, pos %d", ErrInvalidSectionArgument, arg, len(container.Types), i) return nil, fmt.Errorf("%w: arg %d, last %d, pos %d", ErrInvalidSectionArgument, arg, len(container.Types), i)
} }
// TODO check if that is actually a problem if container.Types[arg].Output != 0x80 && container.Types[arg].Output > container.Types[section].Output {
// JUMPF operand must point to a code section with equal or fewer number of outputs as the section in which it resides, or to a section with 0x80 as outputs (non-returning) return nil, fmt.Errorf("%w: arg %d, last %d, pos %d", ErrInvalidNumberOfOutputs, arg, len(container.Types), i)
if container.Types[arg].Output > container.Types[section].Output {
return nil, fmt.Errorf("%w: arg %d, last %d, pos %d", ErrInvalidSectionArgument, arg, len(container.Types), i)
} }
visitedCode[arg] = struct{}{} visitedCode[arg] = struct{}{}
case op == DATALOADN: case op == DATALOADN:

3
core/vm/validate_linear.go
View file

@ -82,9 +82,6 @@ func validateControlFlow2(code []byte, section int, metadata []*FunctionMetadata
return 0, fmt.Errorf("%w: at pos %d", ErrStackUnderflow{stackLen: have, required: want}, pos) return 0, fmt.Errorf("%w: at pos %d", ErrStackUnderflow{stackLen: have, required: want}, pos)
} }
} else { } else {
if metadata[section].Output < newSection.Output {
return 0, fmt.Errorf("%w: at pos %d", ErrInvalidNumberOfOutputs, pos)
}
if currentBounds.max != currentBounds.min { if currentBounds.max != currentBounds.min {
return 0, fmt.Errorf("%w: max %d, min %d, at pos %d", ErrInvalidNumberOfOutputs, currentBounds.max, currentBounds.min, pos) return 0, fmt.Errorf("%w: max %d, min %d, at pos %d", ErrInvalidNumberOfOutputs, currentBounds.max, currentBounds.min, pos)
} }