bireader 1.0.55 → 1.0.58

package/lib/cjs/index.cjs

@@ -1226,11 +1226,14 @@ function rfloat(_this, endian) {
 }
 function wfloat(_this, value, endian) {
     check_size(_this, 4, 0);
-    const maxValue = 3.402823466e+38;
-    const minValue = 1.175494351e-38;
-    if (value < minValue || value > maxValue) {
+    const MIN_POSITIVE_FLOAT32 = 1.17549435e-38;
+    const MAX_POSITIVE_FLOAT32 = 3.4028235e+38;
+    const MIN_NEGATIVE_FLOAT32 = -3.4028235e+38;
+    const MAX_NEGATIVE_FLOAT32 = -1.17549435e-38;
+    if (!((value === 0) || (value >= MIN_POSITIVE_FLOAT32 && value <= MAX_POSITIVE_FLOAT32) ||
+        (value >= MIN_NEGATIVE_FLOAT32 && value <= MAX_NEGATIVE_FLOAT32))) {
         _this.errorDump ? "[Error], hexdump:\n" + _this.hexdump() : "";
-        throw new Error('Value is out of range for the specified float length.' + " min: " + minValue + " max: " + maxValue + " value: " + value);
+        throw new Error('Value is out of range for the specified float length.' + " min: " + MIN_NEGATIVE_FLOAT32 + " max: " + MAX_POSITIVE_FLOAT32 + " value: " + value);
     }
     const dataView = new DataView(new Uint8Array(4).buffer);
     dataView.setFloat32(0, value, true);
@@ -1255,6 +1258,7 @@ function rint64(_this, unsigned, endian) {
     if ((endian == undefined ? _this.endian : endian) == "little") {
         for (let i = 0; i < 8; i++) {
             value = value | BigInt(_this.data[_this.offset]) << BigInt(8 * i);
+            _this.offset += 1;
         }
         if (unsigned == undefined || unsigned == false) {
             if (value & (BigInt(1) << BigInt(63))) {
@@ -1265,6 +1269,7 @@ function rint64(_this, unsigned, endian) {
     else {
         for (let i = 0; i < 8; i++) {
             value = (value << BigInt(8)) | BigInt(_this.data[_this.offset]);
+            _this.offset += 1;
         }
         if (unsigned == undefined || unsigned == false) {
             if (value & (BigInt(1) << BigInt(63))) {
@@ -1272,7 +1277,6 @@ function rint64(_this, unsigned, endian) {
             }
         }
     }
-    _this.offset += 8;
     _this.bitoffset = 0;
     return value;
 }
@@ -1332,11 +1336,15 @@ function wint64(_this, value, unsigned, endian) {
 }
 function wdfloat(_this, value, endian) {
     check_size(_this, 8, 0);
-    const maxValue = 1.7976931348623158e308;
-    const minValue = 2.2250738585072014e-308;
-    if (value < minValue || value > maxValue) {
+    const MIN_POSITIVE_FLOAT64 = 2.2250738585072014e-308;
+    const MAX_POSITIVE_FLOAT64 = 1.7976931348623157e+308;
+    const MIN_NEGATIVE_FLOAT64 = -1.7976931348623157e+308;
+    const MAX_NEGATIVE_FLOAT64 = -2.2250738585072014e-308;
+    if (!((value === 0) ||
+        (value >= MIN_POSITIVE_FLOAT64 && value <= MAX_POSITIVE_FLOAT64) ||
+        (value >= MIN_NEGATIVE_FLOAT64 && value <= MAX_NEGATIVE_FLOAT64))) {
         _this.errorDump ? "[Error], hexdump:\n" + _this.hexdump() : "";
-        throw new Error('Value is out of range for the specified 64bit length.' + " min: " + minValue + " max: " + maxValue + " value: " + value);
+        throw new Error('Value is out of range for the specified 64bit length.' + " min: " + MIN_NEGATIVE_FLOAT64 + " max: " + MAX_POSITIVE_FLOAT64 + " value: " + value);
     }
     const intArray = new Int32Array(2);
     const floatArray = new Float64Array(intArray.buffer);
@@ -1592,11 +1600,10 @@ function wstring(_this, string, options) {
         }
         var maxBytes = Math.min(string.length, maxLength);
         const encodedString = encoder.encode(string.substring(0, maxBytes));
-        var totalLength = (length || encodedString.length) + lengthWriteSize;
+        var totalLength = (length || encodedString.length);
         if (stringType == 'wide-pascal') {
-            totalLength = (length || (encodedString.length * 2)) + lengthWriteSize;
+            totalLength = (length || (encodedString.length * 2));
         }
-        check_size(_this, totalLength, 0);
         if (lengthWriteSize == 1) {
             _this.writeUByte(maxBytes);
         }
@@ -1606,6 +1613,7 @@ function wstring(_this, string, options) {
         else if (lengthWriteSize == 4) {
             _this.writeUInt32(maxBytes, endian);
         }
+        check_size(_this, totalLength, 0);
         // Write the string bytes to the Uint8Array
         for (let i = 0; i < encodedString.length; i++) {
             if (stringType == 'wide-pascal') {