Merge pull request #339 from torquem-ch/win_out_of_range

advanced: Prevent invalid memory subscript index
ethereum · Jun 2, 2021 · 3a2dbeb · 3a2dbeb
2 parents 128d137 + dcee38a
commit 3a2dbeb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -10,6 +10,7 @@ branches:
   - /v\d+\..+/
 configuration:
   - Release
+  - Debug
 environment:
   GITHUB_TOKEN:
     secure: OE3TGKRyt/hvk5Gt3DLXvs3Y+F1NLDQAL/bHplDffR+hY2aFg6HrapThKjYo/XX2
@@ -26,7 +27,7 @@ install:
 
 before_build:
   - call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd" -arch=amd64
-  - cmake -S . -B build -DEVMONE_TESTING=ON -Wno-dev -G "%GENERATOR%" -DCMAKE_INSTALL_PREFIX=C:\install
+  - cmake -S . -B build -DEVMONE_TESTING=ON -Wno-dev -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DHUNTER_CONFIGURATION_TYPES=%CONFIGURATION% -DCMAKE_INSTALL_PREFIX=C:\install
 
 build_script:
   - cmake --build build --target package

diff --git a/lib/evmone/execution.cpp b/lib/evmone/execution.cpp
@@ -20,7 +20,7 @@ evmc_result execute(AdvancedExecutionState& state, const AdvancedCodeAnalysis& a
         (state.status == EVMC_SUCCESS || state.status == EVMC_REVERT) ? state.gas_left : 0;
 
     return evmc::make_result(
-        state.status, gas_left, &state.memory[state.output_offset], state.output_size);
+        state.status, gas_left, state.memory.data() + state.output_offset, state.output_size);
 }
 
 evmc_result execute(evmc_vm* /*unused*/, const evmc_host_interface* host, evmc_host_context* ctx,