engine: call FunctionListener.Abort in correct order (#1501)

tetratelabs · Jun 2, 2023 · 50394cc · 50394cc
1 parent 51d0271
commit 50394cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/internal/engine/compiler/engine.go b/internal/engine/compiler/engine.go
@@ -853,9 +853,7 @@ func (ce *callEngine) deferredOnCall(ctx context.Context, m *wasm.ModuleInstance
 		}
 
 		err = builder.FromRecovered(recovered)
-		// Call listeners in revers order since they were captured while
-		// rewinding the call stack.
-		for i := len(functionListeners) - 1; i >= 0; i-- {
+		for i := range functionListeners {
 			functionListeners[i].Abort(ctx, m, functionListeners[i].def, err)
 		}
 	}

diff --git a/internal/engine/interpreter/interpreter.go b/internal/engine/interpreter/interpreter.go
@@ -584,7 +584,7 @@ func (ce *callEngine) recoverOnCall(ctx context.Context, m *wasm.ModuleInstance,
 	}
 
 	err = builder.FromRecovered(v)
-	for i := len(functionListeners) - 1; i >= 0; i-- {
+	for i := range functionListeners {
 		functionListeners[i].Abort(ctx, m, functionListeners[i].def, err)
 	}