From d17ec1c23b0cb128d19b310fbe44d4ddd8b6792e Mon Sep 17 00:00:00 2001 From: Sam Carlton Date: Thu, 21 Jul 2022 19:54:54 -0500 Subject: [PATCH] Import Buffer directly --- helpers/scanner/parsers/plist.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/helpers/scanner/parsers/plist.js b/helpers/scanner/parsers/plist.js index 0b85082..24088ff 100644 --- a/helpers/scanner/parsers/plist.js +++ b/helpers/scanner/parsers/plist.js @@ -1,7 +1,7 @@ // Adpapted for browser+node from https://github.com/joeferner/node-bplist-parser/blob/master/bplistParser.js import plainTextPlist from 'plist' import bigInt from 'big-integer' -import bufferApi from 'buffer' +import { Buffer } from 'buffer/' // const fs = require('fs'); @@ -40,7 +40,7 @@ export function parsePlistBuffer ( fileBuffer , callback) { return tryParseBuffer( fileBuffer ) - // if (bufferApi.Buffer.isBuffer(fileNameOrBuffer)) { + // if (Buffer.isBuffer(fileNameOrBuffer)) { // } // fs.readFile(fileNameOrBuffer, function(err, data) { @@ -54,7 +54,7 @@ export function parsePlistBuffer ( fileBuffer , callback) { }; export function parseFileSync (fileNameOrBuffer) { - // if (!bufferApi.Buffer.isBuffer(fileNameOrBuffer)) { + // if (!Buffer.isBuffer(fileNameOrBuffer)) { // fileNameOrBuffer = fs.readFileSync(fileNameOrBuffer); // } return parseBuffer(fileNameOrBuffer); @@ -64,6 +64,8 @@ function parseBuffer ( buffer ) { // check header const header = buffer.slice(0, 'bplist'.length).toString('utf8'); + + const isPlainTextPlist = header.includes(' to get byte length multiply by 2, as 1 character takes 2 bytes in UTF-16 length *= (isUtf16 + 1); if (length < maxObjectSize) { - let plistString = bufferApi.Buffer.from(buffer.slice(offset + stroffset, offset + stroffset + length)); + let plistString = Buffer.from(buffer.slice(offset + stroffset, offset + stroffset + length)); if (isUtf16) { plistString = swapBytes(plistString); enc = "ucs2";