Merge pull request ethereum#60 from shemnon/eof/extcodecopy-oob

Limit EXTCODECOPY to eof bytes
shemnon · Feb 4, 2025 · f0dc433 · f0dc433
2 parents 56ff85a + 1156ca4
commit f0dc433
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
@@ -395,6 +395,7 @@ func opExtCodeCopy(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext)
 		codeOffset = stack.pop()
 		length     = stack.pop()
 		lengthU64  = length.Uint64()
+		codeCopy   []byte
 	)
 	uint64CodeOffset, overflow := codeOffset.Uint64WithOverflow()
 	if overflow {
@@ -406,9 +407,10 @@ func opExtCodeCopy(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext)
 		witness.AddCode(code)
 	}
 	if isEOFVersion1(code) {
-		lengthU64 = 2
+		codeCopy = getData(eofMagic, uint64CodeOffset, lengthU64)
+	} else {
+		codeCopy = getData(code, uint64CodeOffset, lengthU64)
 	}
-	codeCopy := getData(code, uint64CodeOffset, lengthU64)
 	scope.Memory.Set(memOffset.Uint64(), lengthU64, codeCopy)
 
 	return nil, nil