Followup to workaround for minification of wasm2js mem init (#2318)

Emscripten's minifier mis-minifies a couple bits in the memory
init function that's used with wasm2js when not using an external
memory init file:

https://github.com/emscripten-core/emscripten/issues/8886

Previous fix worked around the bug in one place but failed to
account for another. Have now confirmed that it works with this
change in place.

Updated test cases to match.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/wasm2js.h b/src/wasm2js.h
index 54a06578f..1526dbb89 100644
--- a/src/wasm2js.h
+++ b/src/wasm2js.h
@@ -2231,14 +2231,14 @@ void Wasm2JSGlue::emitMemory(
     function(mem) {
       var _mem = new Uint8Array(mem);
       return function(offset, s) {
-        var bytes;
+        var bytes, i;
         if (typeof Buffer === 'undefined') {
           bytes = atob(s);
-          for (var i = 0; i < bytes.length; i++)
+          for (i = 0; i < bytes.length; i++)
             _mem[offset + i] = bytes.charCodeAt(i);
         } else {
           bytes = Buffer.from(s, 'base64');
-          for (var i = 0; i < bytes.length; i++)
+          for (i = 0; i < bytes.length; i++)
             _mem[offset + i] = bytes[i];
         }
       }