From 263b697a442273ef9848e73546c770f5b7f6e2a9 Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Tue, 16 Jul 2024 12:20:12 -0700
Subject: [PATCH] Raise imports and exports limit to 1,000,000 (#1682)

See https://github.com/WebAssembly/spec/pull/1766 and
https://github.com/WebAssembly/design/issues/1520 for details.
---
 crates/wasmparser/src/limits.rs    |  3 ++-
 crates/wasmparser/src/validator.rs | 12 +++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/crates/wasmparser/src/limits.rs b/crates/wasmparser/src/limits.rs
index 6e453b6f31..3325af7fad 100644
--- a/crates/wasmparser/src/limits.rs
+++ b/crates/wasmparser/src/limits.rs
@@ -20,7 +20,8 @@
 pub const MAX_WASM_TYPES: usize = 1_000_000;
 pub const MAX_WASM_SUPERTYPES: usize = 1;
 pub const MAX_WASM_FUNCTIONS: usize = 1_000_000;
-pub const MAX_WASM_EXPORTS: usize = 100_000;
+pub const MAX_WASM_IMPORTS: usize = 1_000_000;
+pub const MAX_WASM_EXPORTS: usize = 1_000_000;
 pub const MAX_WASM_GLOBALS: usize = 1_000_000;
 pub const MAX_WASM_ELEMENT_SEGMENTS: usize = 100_000;
 pub const MAX_WASM_DATA_SEGMENTS: usize = 100_000;
diff --git a/crates/wasmparser/src/validator.rs b/crates/wasmparser/src/validator.rs
index de9e1e42cc..5425fad7d2 100644
--- a/crates/wasmparser/src/validator.rs
+++ b/crates/wasmparser/src/validator.rs
@@ -677,7 +677,17 @@ impl Validator {
             Order::Import,
             section,
             "import",
-            |_, _, _, _, _| Ok(()), // add_import will check limits
+            |state, _, _, count, offset| {
+                check_max(
+                    state.module.imports.len(),
+                    count,
+                    MAX_WASM_IMPORTS,
+                    "imports",
+                    offset,
+                )?;
+                state.module.assert_mut().imports.reserve(count as usize);
+                Ok(())
+            },
             |state, features, types, import, offset| {
                 state
                     .module