GitHub/haskell-wasm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better bounds check for table.get and table.set

Browse Source
This commit is contained in:
Ilya Rezvov
2022-06-06 18:44:42 -06:00
parent 4e9105717b
commit 71d332e3dc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Language/Wasm/Interpreter.hs
+2 -2
View File
@@ -982,7 +982,7 @@ eval budget store FunctionInstance { funcType, moduleInstance, code = Function {
RF fnRef -> fnRef RF fnRef -> fnRef
v -> error "Impossible due to validation" v -> error "Impossible due to validation"
els <- readIORef items els <- readIORef items
if dst > MVector.length els if dst >= MVector.length els
then return Trap then return Trap
else do else do
MVector.unsafeWrite els dst (fromIntegral <$> val) 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 TableInstance { t = TableType _ et, items } = tableInstances store ! tableAddr
let dst = fromIntegral offset let dst = fromIntegral offset
els <- readIORef items els <- readIORef items
if dst > MVector.length els if dst >= MVector.length els
then return Trap then return Trap
else do else do
v <- MVector.unsafeRead els dst v <- MVector.unsafeRead els dst
tests/Test.hs
+1 -1
View File
@@ -19,7 +19,7 @@ main = do
files <- files <-
filter (not . List.isPrefixOf "simd") . filter (List.isSuffixOf ".wast") filter (not . List.isPrefixOf "simd") . filter (List.isSuffixOf ".wast")
<$> Directory.listDirectory "tests/spec" <$> Directory.listDirectory "tests/spec"
let files = ["table_get.wast"] -- let files = ["table_get.wast"]
scriptTestCases <- (`mapM` files) $ \file -> do scriptTestCases <- (`mapM` files) $ \file -> do
test <- LBS.readFile ("tests/spec/" ++ file) test <- LBS.readFile ("tests/spec/" ++ file)
return $ testCase file $ do return $ testCase file $ do