From 1c5369b2e1ac65ad814f8dfd1b2640f2a3656ad5 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Tue, 1 Jun 2021 15:45:26 +0200 Subject: [PATCH] Update evmone to prevent out of range access --- .gitmodules | 3 ++- CMakeLists.txt | 2 +- evmone | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 507f3f5982..cf94c43dde 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "evmone"] path = evmone - url = https://github.com/ethereum/evmone.git + url = https://github.com/torquem-ch/evmone + branch = win_out_of_range [submodule "secp256k1"] path = secp256k1 url = https://github.com/bitcoin-core/secp256k1.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 05316b5bf8..6b4c3fa2be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,7 +189,7 @@ add_library(evmone evmone/lib/evmone/analysis.cpp evmone/lib/evmone/vm.hpp) set_source_files_properties(evmone/lib/evmone/vm.cpp PROPERTIES COMPILE_DEFINITIONS PROJECT_VERSION="0.8.0-dev") target_include_directories(evmone PUBLIC evmone/include evmone/lib) -target_link_libraries(evmone PUBLIC evmc intx::intx PRIVATE evmc::instructions ethash) +target_link_libraries(evmone PUBLIC evmc intx::intx PRIVATE evmc::instructions evmc::hex ethash) if(MSVC) target_compile_options(evmone PRIVATE /EHsc) diff --git a/evmone b/evmone index 4d4dea3525..498bb0a512 160000 --- a/evmone +++ b/evmone @@ -1 +1 @@ -Subproject commit 4d4dea3525ab747a59790ddf749bac5bd70316c9 +Subproject commit 498bb0a51285661ac08da3a26a3ddec75a45d881