simplify

Author: dcodeIO

lib/loader/index.js

@@ -49,13 +49,11 @@ function getStringImpl(buffer, ptr) {
   try {
     return utf16.decode(wtf16);
   } catch {
-    let str = "";
-    let off = 0;
-    while (len > STRING_CHUNKSIZE) {
+    let str = "", off = 0;
+    while (len - off > STRING_CHUNKSIZE) {
       str += String.fromCharCode.apply(String, wtf16.subarray(off, off += STRING_CHUNKSIZE));
-      len -= STRING_CHUNKSIZE;
     }
-    return str + String.fromCharCode.apply(String, wtf16.subarray(off, off + len));
+    return str + String.fromCharCode.apply(String, wtf16.subarray(off));
   }
 }
 

lib/loader/umd/index.js

@@ -48,7 +48,9 @@ var loader = (function(exports) {
 
   const STRING_CHUNKSIZE = 1024; // mitigate stack overflow
 
-  const utf16 = new TextDecoder("utf-16le"); // != wtf16
+  const utf16 = new TextDecoder("utf-16le", {
+    fatal: true
+  }); // != wtf16
 
   /** Gets a string from memory. */
 
@@ -58,18 +60,16 @@ var loader = (function(exports) {
     if (len <= STRING_SMALLSIZE) return String.fromCharCode.apply(String, wtf16);
 
     try {
-      return utf16.decode(wtf16, {
-        fatal: true
-      });
+      return utf16.decode(wtf16);
     } catch {
-      let str = "", off = 0;
+      let str = "",
+          off = 0;
 
-      while (len > STRING_CHUNKSIZE) {
+      while (len - off > STRING_CHUNKSIZE) {
         str += String.fromCharCode.apply(String, wtf16.subarray(off, off += STRING_CHUNKSIZE));
-        len -= STRING_CHUNKSIZE;
       }
 
-      return str + String.fromCharCode.apply(String, wtf16.subarray(off, off + len));
+      return str + String.fromCharCode.apply(String, wtf16.subarray(off));
     }
   }
   /** Prepares the base module prior to instantiation. */