complete hex handling

sebastienros · Jul 12, 2024 · d82b81c · d82b81c
1 parent 59f8148
commit d82b81c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/Jint/Native/ArrayBuffer/ArrayBufferConstructor.cs b/Jint/Native/ArrayBuffer/ArrayBufferConstructor.cs
@@ -28,7 +28,7 @@ internal ArrayBufferConstructor(
         _prototypeDescriptor = new PropertyDescriptor(PrototypeObject, PropertyFlag.AllForbidden);
     }
 
-    private ArrayBufferPrototype PrototypeObject { get; }
+    internal ArrayBufferPrototype PrototypeObject { get; }
 
     protected override void Initialize()
     {

diff --git a/Jint/Native/JsArrayBuffer.cs b/Jint/Native/JsArrayBuffer.cs
@@ -28,6 +28,7 @@ internal JsArrayBuffer(
             ExceptionHelper.ThrowRangeError(engine.Realm, "arrayBufferMaxByteLength cannot be larger than int32.MaxValue");
         }
 
+        _prototype = engine.Intrinsics.ArrayBuffer.PrototypeObject;
         _arrayBufferData = data;
         _arrayBufferMaxByteLength = (int?) arrayBufferMaxByteLength;
     }

diff --git a/Jint/Native/TypedArray/TypedArrayConstructor.Types.cs b/Jint/Native/TypedArray/TypedArrayConstructor.Types.cs
@@ -49,9 +49,7 @@ protected override void Initialize()
 
         public JsTypedArray Construct(byte[] values)
         {
-            var array = (JsTypedArray) base.Construct([values.Length], this);
-            FillTypedArrayInstance(array, values);
-            return array;
+            return base.Construct(new JsArrayBuffer(_engine, values));
         }
 
         private JsTypedArray FromBase64(JsValue thisObject, JsValue[] arguments)
@@ -73,8 +71,7 @@ private JsTypedArray FromBase64(JsValue thisObject, JsValue[] arguments)
                 throw result.Error;
             }
 
-            var resultLength = result.Bytes.Length;
-            var ta = AllocateTypedArray(resultLength);
+            var ta = _realm.Intrinsics.Uint8Array.Construct(new JsArrayBuffer(_engine, result.Bytes));
             ta._viewedArrayBuffer._arrayBufferData = result.Bytes;
             return ta;
         }
@@ -135,25 +132,25 @@ private JsTypedArray FromHex(JsValue thisObject, JsValue[] arguments)
                 throw result.Error;
             }
 
-            var resultLength = result.Bytes.Length;
-            var ta = AllocateTypedArray(resultLength);
+            var ta = _realm.Intrinsics.Uint8Array.Construct(new JsArrayBuffer(_engine, result.Bytes));
             ta._viewedArrayBuffer._arrayBufferData = result.Bytes;
             return  ta;
         }
 
         internal static FromEncodingResult FromHex(Engine engine, string s, uint maxLength = int.MaxValue)
         {
             var length = s.Length;
-            var bytes = new byte[length / 2];
+            var bytes = new byte[System.Math.Min(maxLength, length / 2)];
             var read = 0;
 
             if (length % 2 != 0)
             {
                 return new FromEncodingResult(bytes, ExceptionHelper.CreateSyntaxError(engine.Realm, "Invalid hex string"), read);
             }
 
+            int byteIndex = 0;
             const string Allowed = "0123456789abcdefABCDEF";
-            while (read < length && bytes.Length < maxLength)
+            while (read < length && byteIndex < maxLength)
             {
                 var hexits = s.AsSpan(read, 2);
                 if (!Allowed.Contains(hexits[0]) || !Allowed.Contains(hexits[1]))
@@ -166,7 +163,7 @@ internal static FromEncodingResult FromHex(Engine engine, string s, uint maxLeng
 #else
                 var b  = byte.Parse(hexits.ToString(), NumberStyles.HexNumber, CultureInfo.InvariantCulture);
 #endif
-                bytes[read / 2] = b;
+                bytes[byteIndex++] = b;
                 read += 2;
             }
             return new FromEncodingResult(bytes, Error: null, read);

diff --git a/Jint/Native/TypedArray/TypedArrayConstructor.cs b/Jint/Native/TypedArray/TypedArrayConstructor.cs
@@ -59,7 +59,6 @@ public override ObjectInstance Construct(JsValue[] arguments, JsValue newTarget)
                 ExceptionHelper.ThrowTypeError(_realm);
             }
 
-
             var numberOfArgs = arguments.Length;
             if (numberOfArgs == 0)
             {