Mirror/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2024-11-02 06:01:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved register reference regex

Browse Source
This commit is contained in:
n1474335 2017-09-28 19:24:28 +00:00
parent ab7cc878c3
commit ee57a92daa
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/FlowControl.js
View File

@ -127,14 +127,13 @@ const FlowControl = {
*/
function replaceRegister(str) {
// Replace references to registers ($Rn) with contents of registers
str = str ? str.replace(/((?:^|[^\\])(?:\\.|[^\\])*?)\$R(\d{1,2})/g, (match, pre, regNum) => {
return str.replace(/(\\*)\$R(\d{1,2})/g, (match, slashes, regNum) => {
const index = parseInt(regNum, 10) + 1;
return (index <= state.numRegisters || index >= state.numRegisters + registers.length) ?
match : pre + registers[index - state.numRegisters];
}) : str;
// Unescape remaining register references
return str ? str.replace(/\\\$R(\d{1,2})/, "$R$1") : str;
if (index <= state.numRegisters || index >= state.numRegisters + registers.length)
return match;
if (slashes.length % 2 !== 0) return match.slice(1); // Remove escape
return slashes + registers[index - state.numRegisters];
});
}
// Step through all subsequent ops and replace registers in args with extracted content