From 7965ed2746b9ea993914f6f0527c841eb85364ce Mon Sep 17 00:00:00 2001
From: Mark McCaskey <mark@wasmer.io>
Date: Mon, 10 Jun 2019 13:32:33 +0200
Subject: [PATCH] fix newly introduced bug in wasmptr array access

---
 lib/emscripten/src/ptr.rs | 2 +-
 lib/wasi/src/ptr.rs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/emscripten/src/ptr.rs b/lib/emscripten/src/ptr.rs
index 4c7753574..079158f94 100644
--- a/lib/emscripten/src/ptr.rs
+++ b/lib/emscripten/src/ptr.rs
@@ -72,7 +72,7 @@ impl<T: Copy + ValueType> WasmPtr<T, Array> {
                 mem::align_of::<T>(),
             ) as *const Cell<T>;
             let cell_ptrs = &std::slice::from_raw_parts(cell_ptr, slice_full_len)
-                [index as usize..length as usize];
+                [index as usize..slice_full_len as usize];
             Some(cell_ptrs)
         }
     }
diff --git a/lib/wasi/src/ptr.rs b/lib/wasi/src/ptr.rs
index dbc92ad09..021c0925f 100644
--- a/lib/wasi/src/ptr.rs
+++ b/lib/wasi/src/ptr.rs
@@ -75,7 +75,7 @@ impl<T: Copy + ValueType> WasmPtr<T, Array> {
                 mem::align_of::<T>(),
             ) as *const Cell<T>;
             let cell_ptrs = &std::slice::from_raw_parts(cell_ptr, slice_full_len)
-                [index as usize..length as usize];
+                [index as usize..slice_full_len];
             Ok(cell_ptrs)
         }
     }