Mirror
/
CyberChef
mirror of https://github.com/gchq/CyberChef.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed populateOption HTML escape bug. Closes #490

This commit is contained in:
n1474335 2019-02-08 17:28:10 +00:00
parent 7d09ba5669
commit 3d20833d42
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,7 +240,7 @@ function regexHighlight (input, regex, displayTotal) {
if (groups.length) { if (groups.length) {
title += "Groups:\n"; title += "Groups:\n";
for (let i = 0; i < groups.length; i++) { for (let i = 0; i < groups.length; i++) {
title += `\t${i+1}: ${Utils.escapeHtml(groups[i])}\n`; title += `\t${i+1}: ${Utils.escapeHtml(groups[i] || "")}\n`;
} }
} }

4
src/web/HTMLIngredient.mjs
View File

@ -4,6 +4,8 @@
* @license Apache-2.0 * @license Apache-2.0
*/ */
import Utils from "../core/Utils";
/** /**
* Object to handle the creation of operation ingredients. * Object to handle the creation of operation ingredients.
*/ */
@ -156,7 +158,7 @@ class HTMLIngredient {
} else if ((m = this.value[i].name.match(/\[\/([a-z0-9 -()^]+)\]/i))) { } else if ((m = this.value[i].name.match(/\[\/([a-z0-9 -()^]+)\]/i))) {
html += "</optgroup>"; html += "</optgroup>";
} else { } else {
html += `<option populate-value="${this.value[i].value}">${this.value[i].name}</option>`; html += `<option populate-value="${Utils.escapeHtml(this.value[i].value)}">${this.value[i].name}</option>`;
} }
} }
html += `</select> html += `</select>