Fix memory.grow bounds and overflow checks for mem64 (#7112)

Previously the interpreter only executed overflow and bounds checks for
memory.grow on 32-bit memories. Run the checks on 64-bit memories as
well.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
index f3471cfa8..81531e27c 100644
--- a/src/wasm-interpreter.h
+++ b/src/wasm-interpreter.h
@@ -3836,10 +3836,15 @@ public:
     auto fail = Literal::makeFromInt64(-1, memory->addressType);
     Flow ret = Literal::makeFromInt64(memorySize, addressType);
     uint64_t delta = flow.getSingleValue().getUnsigned();
-    if (delta > uint32_t(-1) / Memory::kPageSize && addressType == Type::i32) {
+    uint64_t maxAddr = addressType == Type::i32
+                         ? std::numeric_limits<uint32_t>::max()
+                         : std::numeric_limits<uint64_t>::max();
+    if (delta > maxAddr / Memory::kPageSize) {
+      // Impossible to grow this much.
       return fail;
     }
-    if (memorySize >= uint32_t(-1) - delta && addressType == Type::i32) {
+    if (memorySize >= maxAddr - delta) {
+      // Overflow.
       return fail;
     }
     auto newSize = memorySize + delta;