Skip to content

Disallow non-hex characters in fromHex #1975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
9 changes: 7 additions & 2 deletions src/core/lib/Hex.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -100,19 +100,24 @@ export function toHexFast(data) {
* // returns [10,20,30]
* fromHex("0a:14:1e", "Colon");
*/
export function fromHex(data, delim="Auto", byteLen=2) {
export function fromHex(data, delim="Auto", byteLen=2, removeNonAlphChars=false) {
if (byteLen < 1 || Math.round(byteLen) !== byteLen)
throw new OperationError("Byte length must be a positive integer");

if (removeNonAlphChars)
data = data.replace(/[^\da-fA-F]/g, "");

if (delim !== "None") {
const delimRegex = delim === "Auto" ? /[^a-f\d]|0x/gi : Utils.regexRep(delim);
const delimRegex = delim === "Auto" ? /\s+|0x/gi : Utils.regexRep(delim);
data = data.split(delimRegex);
} else {
data = [data];
}

const output = [];
for (let i = 0; i < data.length; i++) {
if (/[^a-f\d\s]/.test(data[i]))
throw new OperationError("Hex input must only contain hex digits");
for (let j = 0; j < data[i].length; j += byteLen) {
output.push(parseInt(data[i].substr(j, byteLen), 16));
}
Expand Down
9 changes: 7 additions & 2 deletions src/core/operations/FromHex.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ class FromHex extends Operation {
name: "Delimiter",
type: "option",
value: FROM_HEX_DELIM_OPTIONS
},
{
name: "Remove non-alphabet chars",
type: "boolean",
value: true
}
];
this.checks = [
Expand Down Expand Up @@ -92,8 +97,8 @@ class FromHex extends Operation {
* @returns {byteArray}
*/
run(input, args) {
const delim = args[0] || "Auto";
return fromHex(input, delim, 2);
const [delim, removeNonAlphChars] = [args[0] || "Auto", args[1]];
return fromHex(input, delim, 2, removeNonAlphChars);
}

/**
Expand Down
Loading