1 files changed, 16 insertions, 1 deletions
diff --git a/src/interp/linear/load.c b/src/interp/linear/load.c
index afc6154..38294c4 100644
--- a/src/interp/linear/load.c
+++ b/src/interp/linear/load.c
@@ -9,6 +9,7 @@
 
 #include <nanowasm/nw.h>
 #include <nanowasm/linear.h>
+#include <nw/linear.h>
 #include <nw/interp.h>
 #include <nw/mem.h>
 #include <nw/log.h>
@@ -17,7 +18,21 @@ enum nw_state nwp_linear_load(struct nw_interp *const i,
     struct nw_sm_io *const io, const unsigned long offset)
 {
     const struct nw_interp_cfg *const cfg = &i->cfg;
-    const enum nw_state n = nwp_mem_load(&cfg->linear, io, offset, cfg->user);
+    enum nw_state n;
+
+    if (nwp_linear_check(i, offset, io->n))
+    {
+        static const char *const exc = "out-of-bounds read access to "
+            "linear memory";
+
+#ifdef NW_LOG
+        nwp_log("%s, addr=%#lx, sz=%#lx\n", exc, offset, io->n);
+#endif
+        i->exception = exc;
+        return NW_FATAL;
+    }
+
+    n = nwp_mem_load(&cfg->linear, io, offset, cfg->user);
 
     if (n == NW_FATAL)
     {