exlim/cyberchef
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Correctly parse xxd odd byte hexdumps (#2058)

Browse Source 
Co-authored-by: GCHQDeveloper581 <63102987+GCHQDeveloper581@users.noreply.github.com>
This commit is contained in:
Thomas 2026-02-04 09:38:25 +00:00 committed by GitHub
parent 1542cadde8
commit fa34e2fafc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/operations/FromHexdump.mjs
View File

@ -43,7 +43,7 @@ class FromHexdump extends Operation {
*/ */
run(input, args) { run(input, args) {
const output = [], const output = [],
regex = /^\s*(?:[\dA-F]{4,16}h?:?)?[ \t]+((?:[\dA-F]{2} ){1,8}(?:[ \t]|[\dA-F]{2}-)(?:[\dA-F]{2} ){1,8}|(?:[\dA-F]{4} )*[\dA-F]{4}|(?:[\dA-F]{2} )*[\dA-F]{2})/igm; regex = /^\s*(?:[\dA-F]{4,16}h?:?)?[ \t]+((?:[\dA-F]{2} ){1,8}(?:[ \t]|[\dA-F]{2}-)(?:[\dA-F]{2} ){1,8}|(?:[\dA-F]{4} )+(?:[\dA-F]{2})?|(?:[\dA-F]{2} )*[\dA-F]{2})/igm;
let block, line; let block, line;
while ((block = regex.exec(input))) { while ((block = regex.exec(input))) {

11
tests/operations/tests/Hexdump.mjs
View File

@ -152,6 +152,17 @@ TestRegister.addTests([
} }
], ],
}, },
{
name: "From Hexdump: xxd format, odd number of bytes",
input: "00000000: 6162 6364 65 abcde",
expectedOutput: "abcde",
recipeConfig: [
{
op: "From Hexdump",
args: []
}
],
},
{ {
name: "From Hexdump: Wireshark", name: "From Hexdump: Wireshark",
input: `00000000 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f ........ ........ input: `00000000 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f ........ ........