Browse Source

From Hex Regexes

n1073645 5 years ago
parent
commit
3f3a7cd4f6
2 changed files with 8 additions and 2 deletions
  1. 1 0
      src/core/Utils.mjs
  2. 7 2
      src/core/operations/FromHex.mjs

+ 1 - 0
src/core/Utils.mjs

@@ -1182,6 +1182,7 @@ class Utils {
             "CRLF":          /\r\n/g,
             "Forward slash": /\//g,
             "Backslash":     /\\/g,
+            "0x with comma": /,?0x/g,
             "0x":            /0x/g,
             "\\x":           /\\x/g,
             "None":          /\s+/g // Included here to remove whitespace when there shouldn't be any

+ 7 - 2
src/core/operations/FromHex.mjs

@@ -71,12 +71,17 @@ class FromHex extends Operation {
                         args: ["CRLF"]
                     },
                     {
-                        match: "^[\\dA-F]{2}(?:0x[\\dA-F]{2})*$",
+                        match: "^(?:0x[\\dA-F]{2})+$",
                         flags: "i",
                         args: ["0x"]
                     },
                     {
-                        match: "^[\\dA-F]{2}(?:\\\\x[\\dA-F]{2})*$",
+                        match: "^0x[\\dA-F]{2}(?:,0x[\\dA-F]{2})*$",
+                        flags: "i",
+                        args: ["0x with comma"]
+                    },
+                    {
+                        match: "^(?:\\\\x[\\dA-F]{2})+$",
                         flags: "i",
                         args: ["\\x"]
                     }