Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions src/evm/opcode_handlers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -597,18 +597,10 @@ void ExtCodeCopyHandler::doExecute() {
Frame->Msg.gas -= ADDITIONAL_COLD_ACCOUNT_ACCESS_COST;
}

size_t CodeSize = Frame->Host->get_code_size(Addr);

if (Offset >= CodeSize) {
// If Offset is beyond the code size, fill with zeros
if (Size > 0) {
std::memset(Frame->Memory.data() + DestOffset, 0, Size);
}
} else {
if (Size > 0) {
// Copy code to memory
auto CopySize = std::min(Size, CodeSize - Offset);
size_t CopiedSize = Frame->Host->copy_code(
Addr, Offset, Frame->Memory.data() + DestOffset, CopySize);
Addr, Offset, Frame->Memory.data() + DestOffset, Size);
if (CopiedSize < Size) {
// If the copied size is less than requested, fill the rest with zeros
std::memset(Frame->Memory.data() + DestOffset + CopiedSize, 0,
Expand Down
4 changes: 4 additions & 0 deletions tests/evmone_unittests/EVMOneInterpreterUnitTestsRunList.txt
Original file line number Diff line number Diff line change
Expand Up @@ -209,3 +209,7 @@ multi_vm/evm.exp/external_vm
multi_vm/evm.exp_oog/external_vm
multi_vm/evm.exp_pre_spurious_dragon/external_vm
multi_vm/evm.shift_overflow/external_vm
multi_vm/evm.eip2929_case2/external_vm
multi_vm/evm.extcode/external_vm
multi_vm/evm.extcodecopy_nonzero_index/external_vm
multi_vm/evm.extcodecopy_fill_tail/external_vm