Validation: Check table types

Author: kateinoigakukun

Sources/WasmKit/Execution/Instances.swift

@@ -264,6 +264,10 @@ struct TableEntity /* : ~Copyable */ {
     let tableType: TableType
     var limits: Limits { tableType.limits }
 
+    static func maxSize(isMemory64: Bool) -> UInt64 {
+        return UInt64(UInt32.max)
+    }
+
     init(_ tableType: TableType, resourceLimiter: any ResourceLimiter) throws {
         let emptyElement: Reference
         switch tableType.elementType {

Sources/WasmKit/Validator.swift

@@ -69,6 +69,9 @@ struct ModuleValidator {
         for memoryType in module.memoryTypes {
             try Self.checkMemoryType(memoryType, features: module.features)
         }
+        for tableType in module.tableTypes {
+            try Self.checkTableType(tableType, features: module.features)
+        }
         try checkStartFunction()
     }
 
@@ -107,6 +110,29 @@ struct ModuleValidator {
         }
     }
 
+    static func checkTableType(_ type: TableType, features: WasmFeatureSet) throws {
+        if type.elementType != .funcRef, !features.contains(.referenceTypes) {
+            throw ValidationError("reference-types feature is required for non-funcref tables")
+        }
+        try checkLimit(type.limits)
+
+        if type.limits.isMemory64 {
+            guard features.contains(.memory64) else {
+                throw ValidationError("memory64 feature is required for 64-bit tables")
+            }
+        }
+
+        let hardMax = TableEntity.maxSize(isMemory64: type.limits.isMemory64)
+
+        if type.limits.min > hardMax {
+            throw ValidationError("size minimum must not be greater than \(hardMax)")
+        }
+
+        if let max = type.limits.max, max > hardMax {
+            throw ValidationError("size maximum must not be greater than \(hardMax)")
+        }
+    }
+
     private static func checkLimit(_ limit: Limits) throws {
         guard let max = limit.max else { return }
         if limit.min > max {

Tests/WasmKitTests/SpectestTests.swift

@@ -22,7 +22,7 @@ final class SpectestTests: XCTestCase {
             path: Self.testPaths,
             include: [],
             exclude: [
-                "table.wast",
+                "/br_table.wast",
                 "table_get.wast",
                 "table_grow.wast",
                 "table_size.wast",