hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 19:26:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

JS: Extract surrogate pairs as one constant node

Browse Source
This commit is contained in:
Asger F
2019-10-24 12:23:30 +01:00
parent 6e1c995f2f
commit 68d23bcf8c
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
javascript/extractor/src/com/semmle/js/parser/RegExpParser.java
View File

@@ -489,6 +489,11 @@ public class RegExpParser {
if (this.match("b")) return this.finishTerm(new ControlEscape(loc, "\b", 8, "\\b"));
return this.finishTerm(this.parseAtomEscape(loc, true));
}
return this.finishTerm(new Constant(loc, String.valueOf(c)));
String value = String.valueOf(c);
// Extract a surrogate pair as a single constant.
if (Character.isHighSurrogate(c) && Character.isLowSurrogate(peekChar(true))) {
value += this.nextChar();
}
return this.finishTerm(new Constant(loc, value));
}
}

4
javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/tst.js
View File

@@ -8,4 +8,6 @@
/[aaa]/;
/[\x0a\x0a]/;
/[\u000a\n]/;
/[\u{ff}]/;
/[\u{ff}]/;
/[\u{12340}-\u{12345}]/u; // OK
new RegExp("[\u{12340}-\u{12345}]", "u"); // OK