baseline: Fix output buffer

ethereum · Dec 17, 2020 · 8cac359 · 8cac359
1 parent dff51a6
commit 8cac359
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/evmone/baseline.cpp b/lib/evmone/baseline.cpp
@@ -66,9 +66,8 @@ inline void op_return(ExecutionState& state) noexcept
         return;
     }
 
+    state.output_offset = static_cast<size_t>(offset);
     state.output_size = static_cast<size_t>(size);
-    if (state.output_size != 0)
-        state.output_offset = static_cast<size_t>(offset);
     state.status = StatusCode;
 }
 
@@ -721,7 +720,8 @@ evmc_result baseline_execute(evmc_vm* /*vm*/, const evmc_host_interface* host,
     const auto gas_left =
         (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);
+    return evmc::make_result(state->status, gas_left,
+        state->output_size != 0 ? &state->memory[state->output_offset] : nullptr,
+        state->output_size);
 }
 }  // namespace evmone