mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-06-15 10:44:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

extracted substr and added check for throwError in Hex.mjs

Browse source
This commit is contained in:
rmurugan58 2025-04-25 22:11:20 -04:00
parent 49a80b4715
commit 278c221f1f
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/core/lib/Hex.mjs
View file

@ -100,7 +100,7 @@ export function toHexFast(data) {
* // returns [10,20,30] * // returns [10,20,30]
* fromHex("0a:14:1e", "Colon"); * fromHex("0a:14:1e", "Colon");
*/ */
export function fromHex(data, delim="Auto", byteLen=2) { export function fromHex(data, delim="Auto", byteLen=2, throwError=false) { //added throwError parameter
if (byteLen < 1 || Math.round(byteLen) !== byteLen) if (byteLen < 1 || Math.round(byteLen) !== byteLen)
throw new OperationError("Byte length must be a positive integer"); throw new OperationError("Byte length must be a positive integer");
@ -114,7 +114,11 @@ export function fromHex(data, delim="Auto", byteLen=2) {
const output = []; const output = [];
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
for (let j = 0; j < data[i].length; j += byteLen) { for (let j = 0; j < data[i].length; j += byteLen) {
output.push(parseInt(data[i].substr(j, byteLen), 16)); const chunk = data[i].substr(j, byteLen); //extracted substr into a chunk variable
if (throwError && /[^a-f\d]/i.test(chunk)) { //added validation check for when throwError is true
throw new OperationError(`Invalid hex character in chunk "${chunk}"`); //throw on invalid hex chunk
}
output.push(parseInt(chunk, 16)); //parseInt now uses chunk
} }
} }
return output; return output;