From 71d332e3dc949b1830ce045d91eabc4f700a00d9 Mon Sep 17 00:00:00 2001
From: Ilya Rezvov <rezvov.ilya@gmail.com>
Date: Mon, 6 Jun 2022 18:44:42 -0600
Subject: [PATCH] better bounds check for table.get and table.set

---
 src/Language/Wasm/Interpreter.hs | 4 ++--
 tests/Test.hs                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Language/Wasm/Interpreter.hs b/src/Language/Wasm/Interpreter.hs
index 7021735..0ffbe24 100644
--- a/src/Language/Wasm/Interpreter.hs
+++ b/src/Language/Wasm/Interpreter.hs
@@ -982,7 +982,7 @@ eval budget store FunctionInstance { funcType, moduleInstance, code = Function {
                     RF fnRef -> fnRef
                     v -> error "Impossible due to validation"
             els <- readIORef items
-            if dst > MVector.length els
+            if dst >= MVector.length els
             then return Trap
             else do
                 MVector.unsafeWrite els dst (fromIntegral <$> val)
@@ -992,7 +992,7 @@ eval budget store FunctionInstance { funcType, moduleInstance, code = Function {
             let TableInstance { t = TableType _ et, items } = tableInstances store ! tableAddr
             let dst = fromIntegral offset
             els <- readIORef items
-            if dst > MVector.length els
+            if dst >= MVector.length els
             then return Trap
             else do
                 v <- MVector.unsafeRead els dst
diff --git a/tests/Test.hs b/tests/Test.hs
index eb17f3c..0c0b193 100644
--- a/tests/Test.hs
+++ b/tests/Test.hs
@@ -19,7 +19,7 @@ main = do
   files <-
     filter (not . List.isPrefixOf "simd") . filter (List.isSuffixOf ".wast")
       <$> Directory.listDirectory "tests/spec"
-  let files = ["table_get.wast"]
+  -- let files = ["table_get.wast"]
   scriptTestCases <- (`mapM` files) $ \file -> do
     test <- LBS.readFile ("tests/spec/" ++ file)
     return $ testCase file $ do