diff --git a/src/wasm/wasm-external-refs.cc b/src/wasm/wasm-external-refs.cc
index c18aa5eef0..c43d6e7214 100644
--- a/src/wasm/wasm-external-refs.cc
+++ b/src/wasm/wasm-external-refs.cc
@@ -278,7 +278,11 @@ DISABLE_ASAN void memory_copy_wrapper(Address dst, Address src, uint32_t size) {
   }
 }
 
-void memory_fill_wrapper(Address dst, uint32_t value, uint32_t size) {
+// Asan on Windows triggers exceptions in this function that confuse the
+// WebAssembly trap handler, so Asan is disabled. See the comment on
+// memory_copy_wrapper above for more info.
+DISABLE_ASAN void memory_fill_wrapper(Address dst, uint32_t value,
+                                      uint32_t size) {
   // Use an explicit forward copy to match the required semantics for the
   // memory.fill instruction. It is assumed that the caller of this function
   // has already performed bounds checks, so {dst + size} should not overflow.
diff --git a/test/mjsunit/regress/wasm/regress-957405.js b/test/mjsunit/regress/wasm/regress-957405.js
new file mode 100644
index 0000000000..a83104297e
--- /dev/null
+++ b/test/mjsunit/regress/wasm/regress-957405.js
@@ -0,0 +1,20 @@
+// Copyright 2019 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+load('test/mjsunit/wasm/wasm-module-builder.js');
+
+const memory = new WebAssembly.Memory({initial: 1});
+
+let builder = new WasmModuleBuilder();
+builder.addImportedMemory("imports", "mem");
+builder.addFunction("fill", kSig_v_iii)
+       .addBody([kExprGetLocal, 0, // dst
+                 kExprGetLocal, 1, // value
+                 kExprGetLocal, 2, // size
+                 kNumericPrefix, kExprMemoryFill, 0]).exportAs("fill");
+let instance = builder.instantiate({imports: {mem: memory}});
+memory.grow(1);
+assertTraps(
+    kTrapMemOutOfBounds,
+    () => instance.exports.fill(kPageSize + 1, 123, kPageSize));