Merge remote-tracking branch 'origin/master' into release

Author: actions-user

std/assembly/string.ts

@@ -637,7 +637,7 @@ export namespace String {
     export function byteLength(str: string, nullTerminated: bool = false): i32 {
       var strOff = changetype<usize>(str);
       var strEnd = strOff + <usize>changetype<BLOCK>(changetype<usize>(str) - BLOCK_OVERHEAD).rtSize;
-      var bufLen = nullTerminated ? 1 : 0;
+      var bufLen = i32(nullTerminated);
       while (strOff < strEnd) {
         let c1 = <u32>load<u16>(strOff);
         if (c1 < 128) {
@@ -661,12 +661,13 @@ export namespace String {
     export function encode(str: string, nullTerminated: bool = false): ArrayBuffer {
       var strOff = changetype<usize>(str);
       var strEnd = changetype<usize>(str) + <usize>changetype<BLOCK>(changetype<usize>(str) - BLOCK_OVERHEAD).rtSize;
-      var buf = __alloc(UTF8.byteLength(str, nullTerminated), idof<ArrayBuffer>());
+      var bufLen = <usize>UTF8.byteLength(str, nullTerminated);
+      var buf = __alloc(bufLen, idof<ArrayBuffer>());
+      var bufEnd = buf + bufLen - usize(nullTerminated);
       var bufOff = buf;
-      while (strOff < strEnd) {
+      while (bufOff < bufEnd) {
         let c1 = <u32>load<u16>(strOff);
         if (c1 < 128) {
-          if (nullTerminated && !c1) break;
           store<u8>(bufOff, c1);
           bufOff += 1; strOff += 2;
         } else if (c1 < 2048) {
@@ -692,12 +693,9 @@ export namespace String {
           strOff += 2; bufOff += 3;
         }
       }
+      assert(strOff <= strEnd);
       if (nullTerminated) {
-        assert(strOff <= strEnd);
-        buf = __realloc(buf, bufOff - buf + 1);
         store<u8>(bufOff, 0);
-      } else {
-        assert(strOff == strEnd);
       }
       return changetype<ArrayBuffer>(buf); // retains
     }

std/assembly/typedarray.ts

@@ -1734,27 +1734,26 @@ function REVERSE<TArray extends ArrayBufferView, T>(array: TArray): TArray {
 // @ts-ignore: decorator
 @inline
 function WRAP<TArray extends ArrayBufferView, T>(buffer: ArrayBuffer, byteOffset: i32 = 0, length: i32 = -1): TArray {
+  var byteLength: i32;
   var bufferByteLength = buffer.byteLength;
-  if (<u32>byteOffset >= <u32>bufferByteLength) {
+  const mask = sizeof<T>() - 1;
+  if (i32(<u32>byteOffset > <u32>bufferByteLength) | (byteOffset & mask)) {
     throw new RangeError(E_INDEXOUTOFRANGE);
   }
-  var byteLength: i32;
   if (length < 0) {
     if (length == -1) {
-      const mask = <i32>(1 << alignof<T>() - 1);
-      if (buffer.byteLength & mask) {
+      if (bufferByteLength & mask) {
         throw new RangeError(E_INVALIDLENGTH);
-      } else {
-        byteLength = buffer.byteLength;
       }
+      byteLength = bufferByteLength - byteOffset;
     } else {
       throw new RangeError(E_INVALIDLENGTH);
     }
   } else {
     byteLength = length << alignof<T>();
-  }
-  if (byteOffset + byteLength > buffer.byteLength) {
-    throw new RangeError(E_INVALIDLENGTH);
+    if (byteOffset + byteLength > bufferByteLength) {
+      throw new RangeError(E_INVALIDLENGTH);
+    }
   }
   var out = __alloc(offsetof<TArray>(), idof<TArray>());
   store<usize>(out, __retain(changetype<usize>(buffer)), offsetof<TArray>("buffer"));