v0.1.18: fix Packet.fromBase64

taichunmin · May 16, 2023 · b6d197d · b6d197d
1 parent 854651e
commit b6d197d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
   "name": "pn532.js",
   "type": "module",
   "unpkg": "dist/pn532.min.js",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "bugs": {
     "url": "https://github.com/taichunmin/pn532.js/issues"
   },

diff --git a/src/Packet.js b/src/Packet.js
@@ -87,7 +87,7 @@ export default class Packet extends Uint8Array {
     base64 = `${base64}AAA`.slice(0, tmp2 - tmp2 % 4)
     const pack = new Packet(base64.length * 3 >>> 2)
     let parsedLen = 0
-    for (let i = 0; i < base64.length; i++) {
+    for (let i = 0; i < base64.length; i += 4) {
       const u24 = (BASE64_CHAR.get(base64[i]) << 18) +
         (BASE64_CHAR.get(base64[i + 1]) << 12) +
         (BASE64_CHAR.get(base64[i + 2]) << 6) +

diff --git a/src/Packet.test.js b/src/Packet.test.js
@@ -228,6 +228,7 @@ test.each([
   ['MQ', 'MQ'],
   ['MTI', 'MTI'],
   ['MTIz', 'MTIz'],
+  ['SGVs/G8+d29ybGQ', 'SGVs_G8-d29ybGQ'],
 ])('Packet.fromBase64(%j).base64url = %j', async (hex, expected) => {
   const actual = Packet.fromBase64(hex).base64url
   expect(actual).toEqual(expected)
@@ -239,6 +240,7 @@ test.each([
   ['MQ', 'MQ=='],
   ['MTI', 'MTI='],
   ['MTIz', 'MTIz'],
+  ['SGVs_G8-d29ybGQ', 'SGVs/G8+d29ybGQ='],
 ])('Packet.fromBase64(%j).base64 = %j', async (hex, expected) => {
   const actual = Packet.fromBase64(hex).base64
   expect(actual).toEqual(expected)