From 62ecc63af015d7312415aa5a0d13f2e37e46ac3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=20=E5=BE=81=E8=B5=9C?= <959220793@qq.com> Date: Tue, 29 Aug 2023 00:55:06 +0800 Subject: [PATCH] bugfix for wrong buffer size for preDec --- kgm_wasm.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/kgm_wasm.ts b/kgm_wasm.ts index 039c3be..1a9b021 100644 --- a/kgm_wasm.ts +++ b/kgm_wasm.ts @@ -2,7 +2,7 @@ import { KgmCrypto } from '@xhacker/kgmwasm/KgmWasmBundle'; import KgmCryptoModule from '@xhacker/kgmwasm/KgmWasmBundle'; import { MergeUint8Array } from '@/utils/MergeUint8Array'; -// 每次处理 2M 的数据 +// 每次可以处理 2M 的数据 const DECRYPTION_BUF_SIZE = 2 *1024 * 1024; export interface KGMDecryptionResult { @@ -36,12 +36,12 @@ export async function DecryptKgmWasm(kgmBlob: ArrayBuffer, ext: string): Promise // 申请内存块,并文件末端数据到 WASM 的内存堆 let kgmBuf = new Uint8Array(kgmBlob); - const pQmcBuf = KgmCryptoObj._malloc(DECRYPTION_BUF_SIZE); - KgmCryptoObj.writeArrayToMemory(kgmBuf.slice(0, DECRYPTION_BUF_SIZE), pQmcBuf); + const pKgmBuf = KgmCryptoObj._malloc(DECRYPTION_BUF_SIZE); + const preDecDataSize = Math.min(DECRYPTION_BUF_SIZE, kgmBlob.byteLength); // 初始化缓冲区大小 + KgmCryptoObj.writeArrayToMemory(kgmBuf.slice(0, preDecDataSize), pKgmBuf); // 进行解密初始化 - const headerSize = KgmCryptoObj.preDec(pQmcBuf, DECRYPTION_BUF_SIZE, ext); - console.log(headerSize); + const headerSize = KgmCryptoObj.preDec(pKgmBuf, preDecDataSize, ext); kgmBuf = kgmBuf.slice(headerSize); const decryptedParts = []; @@ -52,14 +52,14 @@ export async function DecryptKgmWasm(kgmBlob: ArrayBuffer, ext: string): Promise // 解密一些片段 const blockData = new Uint8Array(kgmBuf.slice(offset, offset + blockSize)); - KgmCryptoObj.writeArrayToMemory(blockData, pQmcBuf); - KgmCryptoObj.decBlob(pQmcBuf, blockSize, offset); - decryptedParts.push(KgmCryptoObj.HEAPU8.slice(pQmcBuf, pQmcBuf + blockSize)); + KgmCryptoObj.writeArrayToMemory(blockData, pKgmBuf); + KgmCryptoObj.decBlob(pKgmBuf, blockSize, offset); + decryptedParts.push(KgmCryptoObj.HEAPU8.slice(pKgmBuf, pKgmBuf + blockSize)); offset += blockSize; bytesToDecrypt -= blockSize; } - KgmCryptoObj._free(pQmcBuf); + KgmCryptoObj._free(pKgmBuf); result.data = MergeUint8Array(decryptedParts); result.success = true;