Преглед изворни кода

Fix out of bounds issues after memory.grow on non-aot non-threads builds (#3872)

Co-authored-by: Deniz Sokmen <dsokmen@amazon.com>
Maks Litskevich пре 1 година
родитељ
комит
6426fc4993

+ 1 - 1
core/iwasm/interpreter/wasm_interp_classic.c

@@ -6727,7 +6727,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
     || WASM_CPU_SUPPORTS_UNALIGNED_ADDR_ACCESS == 0 \
     || WASM_CPU_SUPPORTS_UNALIGNED_ADDR_ACCESS == 0 \
     || WASM_ENABLE_BULK_MEMORY != 0
     || WASM_ENABLE_BULK_MEMORY != 0
             if (memory)
             if (memory)
-                linear_mem_size = get_linear_mem_size();
+                linear_mem_size = GET_LINEAR_MEMORY_SIZE(memory);
 #endif
 #endif
             if (wasm_copy_exception(module, NULL)) {
             if (wasm_copy_exception(module, NULL)) {
 #if WASM_ENABLE_EXCE_HANDLING != 0
 #if WASM_ENABLE_EXCE_HANDLING != 0

+ 1 - 1
core/iwasm/interpreter/wasm_interp_fast.c

@@ -5994,7 +5994,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
     || WASM_CPU_SUPPORTS_UNALIGNED_ADDR_ACCESS == 0 \
     || WASM_CPU_SUPPORTS_UNALIGNED_ADDR_ACCESS == 0 \
     || WASM_ENABLE_BULK_MEMORY != 0
     || WASM_ENABLE_BULK_MEMORY != 0
             if (memory)
             if (memory)
-                linear_mem_size = get_linear_mem_size();
+                linear_mem_size = GET_LINEAR_MEMORY_SIZE(memory);
 #endif
 #endif
             if (wasm_copy_exception(module, NULL))
             if (wasm_copy_exception(module, NULL))
                 goto got_exception;
                 goto got_exception;