review: fix style and remove redundant WasmHeader check

Signed-off-by: Takeshi Yoneda <[email protected]>

Author: mathetake

src/common/bytecode_util.cc

@@ -19,6 +19,7 @@ namespace proxy_wasm {
 namespace common {
 
 bool BytecodeUtil::checkWasmHeader(std::string_view bytecode) {
+  // Wasm file header is 8 bytes (magic number + version).
   static const uint8_t wasm_magic_number[4] = {0x00, 0x61, 0x73, 0x6d};
   return bytecode.size() < 8 || !::memcmp(bytecode.data(), wasm_magic_number, 4);
 }
@@ -29,6 +30,7 @@ bool BytecodeUtil::getAbiVersion(std::string_view bytecode, proxy_wasm::AbiVersi
   if (!checkWasmHeader(bytecode)) {
     return false;
   }
+
   // Skip the Wasm header.
   const char *pos = bytecode.data() + 8;
   const char *end = bytecode.data() + bytecode.size();

src/common/bytecode_util.h

@@ -33,9 +33,9 @@ class BytecodeUtil {
   static bool checkWasmHeader(std::string_view bytecode);
 
   /**
-   * checkWasmHeader extracts ABI version from the bytecode.
+   * getAbiVersion extracts ABI version from the bytecode.
    * @param bytecode is the target bytecode.
-   * @param ret is the reference to store the extracted ABI version or UnKnonw if it doesn't exist.
+   * @param ret is the reference to store the extracted ABI version or UnKnown if it doesn't exist.
    * @return indicates whether parsing succeeded or not.
    */
   static bool getAbiVersion(std::string_view bytecode, proxy_wasm::AbiVersion &ret);

src/v8/v8.cc

@@ -254,12 +254,6 @@ template <typename T, typename U> constexpr T convertValTypesToArgsTuple(const U
 bool V8::load(const std::string &code, bool allow_precompiled) {
   store_ = wasm::Store::make(engine());
 
-  // Wasm file header is 8 bytes (magic number + version).
-  if (!common::BytecodeUtil::checkWasmHeader(code)) {
-    fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
-    return false;
-  }
-
   // Get ABI version from bytecode.
   if (!common::BytecodeUtil::getAbiVersion(code, abi_version_)) {
     fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");

src/wasmtime/wasmtime.cc

@@ -115,11 +115,6 @@ class Wasmtime : public WasmVm {
 bool Wasmtime::load(const std::string &code, bool allow_precompiled) {
   store_ = wasm_store_new(engine());
 
-  if (!common::BytecodeUtil::checkWasmHeader(code)) {
-    fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
-    return false;
-  }
-
   // Get ABI version from bytecode.
   if (!common::BytecodeUtil::getAbiVersion(code, abi_version_)) {
     fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");