From 11271a201633d3b07adacd07e407ac8d07e5fce3 Mon Sep 17 00:00:00 2001
From: Henry Gressmann <mail@henrygressmann.de>
Date: Thu, 9 May 2024 20:09:05 +0200
Subject: chore: update dependencies + test spec

Signed-off-by: Henry Gressmann <mail@henrygressmann.de>
---
 crates/parser/Cargo.toml        |  2 +-
 crates/parser/src/conversion.rs | 27 ++++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

(limited to 'crates/parser')

diff --git a/crates/parser/Cargo.toml b/crates/parser/Cargo.toml
index 7d726d4..73f430b 100644
--- a/crates/parser/Cargo.toml
+++ b/crates/parser/Cargo.toml
@@ -8,7 +8,7 @@ authors.workspace=true
 repository.workspace=true
 
 [dependencies]
-wasmparser={version="0.206", default-features=false}
+wasmparser={version="0.207", default-features=false, features=["validate"]}
 log={version="0.4", optional=true}
 tinywasm-types={version="0.6.0", path="../types", default-features=false}
 
diff --git a/crates/parser/src/conversion.rs b/crates/parser/src/conversion.rs
index ccdc308..e94986d 100644
--- a/crates/parser/src/conversion.rs
+++ b/crates/parser/src/conversion.rs
@@ -80,8 +80,16 @@ pub(crate) fn convert_module_import(import: wasmparser::Import<'_>) -> Result<Im
             wasmparser::TypeRef::Func(ty) => ImportKind::Function(ty),
             wasmparser::TypeRef::Table(ty) => ImportKind::Table(TableType {
                 element_type: convert_reftype(&ty.element_type),
-                size_initial: ty.initial,
-                size_max: ty.maximum,
+                size_initial: ty.initial.try_into().map_err(|_| {
+                    crate::ParseError::UnsupportedOperator(format!("Table size initial is too large: {}", ty.initial))
+                })?,
+                size_max: if let Some(max) = ty.maximum {
+                    Some(max.try_into().map_err(|_| {
+                        crate::ParseError::UnsupportedOperator(format!("Table size max is too large: {}", max))
+                    })?)
+                } else {
+                    None
+                },
             }),
             wasmparser::TypeRef::Memory(ty) => ImportKind::Memory(convert_module_memory(ty)?),
             wasmparser::TypeRef::Global(ty) => {
@@ -123,7 +131,20 @@ pub(crate) fn convert_module_tables<'a, T: IntoIterator<Item = wasmparser::Resul
 
 pub(crate) fn convert_module_table(table: wasmparser::Table<'_>) -> Result<TableType> {
     let ty = convert_reftype(&table.ty.element_type);
-    Ok(TableType { element_type: ty, size_initial: table.ty.initial, size_max: table.ty.maximum })
+
+    let size_initial = table.ty.initial.try_into().map_err(|_| {
+        crate::ParseError::UnsupportedOperator(format!("Table size initial is too large: {}", table.ty.initial))
+    })?;
+    let size_max = if let Some(max) = table.ty.maximum {
+        Some(
+            max.try_into()
+                .map_err(|_| crate::ParseError::UnsupportedOperator(format!("Table size max is too large: {}", max)))?,
+        )
+    } else {
+        None
+    };
+
+    Ok(TableType { element_type: ty, size_initial: size_initial, size_max })
 }
 
 pub(crate) fn convert_module_globals<'a, T: IntoIterator<Item = wasmparser::Result<wasmparser::Global<'a>>>>(
-- 
cgit v1.3.1