From a56b4435c1c1458c83210bd56aec90aebf05373a Mon Sep 17 00:00:00 2001
From: Takeshi Yoneda <takeshi@tetrate.io>
Date: Tue, 11 Apr 2023 17:23:48 -0700
Subject: [PATCH] Fixes memory capacity with max larger than limit (#1356)

Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
---
 internal/wasm/binary/decoder.go     |  2 +-
 internal/wasm/binary/memory_test.go | 38 +++++++++++++++++------------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/internal/wasm/binary/decoder.go b/internal/wasm/binary/decoder.go
index 7387c85f..f1abada3 100644
--- a/internal/wasm/binary/decoder.go
+++ b/internal/wasm/binary/decoder.go
@@ -181,7 +181,7 @@ func newMemorySizer(memoryLimitPages uint32, memoryCapacityFromMax bool) memoryS
 			}
 			// This is a valid value, but it goes over the run-time limit: return the limit.
 			if *maxPages > memoryLimitPages {
-				return minPages, memoryLimitPages, memoryLimitPages
+				return minPages, minPages, memoryLimitPages
 			}
 			return minPages, minPages, *maxPages
 		}
diff --git a/internal/wasm/binary/memory_test.go b/internal/wasm/binary/memory_test.go
index 8cff4c62..32bfa188 100644
--- a/internal/wasm/binary/memory_test.go
+++ b/internal/wasm/binary/memory_test.go
@@ -12,7 +12,7 @@ import (
 
 func Test_newMemorySizer(t *testing.T) {
 	zero := uint32(0)
-	one := uint32(1)
+	ten := uint32(10)
 	defaultLimit := wasm.MemoryLimitPages
 
 	tests := []struct {
@@ -50,23 +50,23 @@ func Test_newMemorySizer(t *testing.T) {
 			expectedMax:      zero,
 		},
 		{
-			name:             "min 0, max 1",
+			name:             "min 0, max 10",
 			limit:            defaultLimit,
 			min:              zero,
-			max:              &one,
+			max:              &ten,
 			expectedMin:      zero,
 			expectedCapacity: zero,
-			expectedMax:      one,
+			expectedMax:      ten,
 		},
 		{
-			name:                  "min 0, max 1 memoryCapacityFromMax",
+			name:                  "min 0, max 10 memoryCapacityFromMax",
 			limit:                 defaultLimit,
 			memoryCapacityFromMax: true,
 			min:                   zero,
-			max:                   &one,
+			max:                   &ten,
 			expectedMin:           zero,
-			expectedCapacity:      one,
-			expectedMax:           one,
+			expectedCapacity:      ten,
+			expectedMax:           ten,
 		},
 		{
 			name:             "min 10, no max",
@@ -88,11 +88,20 @@ func Test_newMemorySizer(t *testing.T) {
 		{
 			name:             "min=max",
 			limit:            defaultLimit,
-			min:              one,
-			max:              &one,
-			expectedMin:      one,
-			expectedCapacity: one,
-			expectedMax:      one,
+			min:              ten,
+			max:              &ten,
+			expectedMin:      ten,
+			expectedCapacity: ten,
+			expectedMax:      ten,
+		},
+		{
+			name:             "max > memoryLimitPages",
+			limit:            5,
+			min:              0,
+			max:              &ten,
+			expectedMin:      0,
+			expectedCapacity: 0,
+			expectedMax:      5,
 		},
 	}
 
@@ -168,10 +177,9 @@ func TestMemoryType(t *testing.T) {
 			tmax := max
 			expectedDecoded := tc.input
 			if tc.memoryLimitPages != 0 {
-				// If a memory limit exists, then the expected module Max, Cap reflect that limit.
+				// If a memory limit exists, then the expected module Max reflects that limit.
 				tmax = tc.memoryLimitPages
 				expectedDecoded.Max = tmax
-				expectedDecoded.Cap = tmax
 			}
 
 			binary, err := decodeMemory(bytes.NewReader(b), newMemorySizer(tmax, false), tmax)