hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-02-13 05:31:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Exposed flags to the regex parser

Browse Source
This commit is contained in:
Napalys
2025-03-02 16:53:18 +01:00
parent 2f2c9f8943
commit cb448db3ce
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
View File

@@ -600,7 +600,7 @@ public class ASTExtractor {
SourceMap sourceMap =
SourceMap.legacyWithStartPos(
SourceMap.fromString(nd.getRaw()).offsetBy(0, offsets), startPos);
regexpExtractor.extract(source.substring(1, source.lastIndexOf('/')), sourceMap, nd, false);
regexpExtractor.extract(source.substring(1, source.lastIndexOf('/')), sourceMap, nd, false, source.substring(source.lastIndexOf('/'), source.length()));
} else if (nd.isStringLiteral()
&& !c.isInsideType()
&& nd.getRaw().length() < 1000

8
javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java
View File

@@ -346,8 +346,8 @@ public class RegExpExtractor {
}
}
public void extract(String src, SourceMap sourceMap, Node parent, boolean isSpeculativeParsing) {
Result res = parser.parse(src);
public void extract(String src, SourceMap sourceMap, Node parent, boolean isSpeculativeParsing, String flags) {
Result res = parser.parse(src, flags);
if (isSpeculativeParsing && res.getErrors().size() > 0) {
return;
}
@@ -364,4 +364,8 @@ public class RegExpExtractor {
this.emitLocation(err, lbl);
}
}
public void extract(String src, SourceMap sourceMap, Node parent, boolean isSpeculativeParsing) {
extract(src, sourceMap, parent, isSpeculativeParsing, "");
}
}

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

@@ -67,6 +67,7 @@ public class RegExpParser {
private List<Error> errors;
private List<BackReference> backrefs;
private int maxbackref;
private String flags;
/** Parse the given string as a regular expression. */
public Result parse(String src) {
@@ -82,6 +83,11 @@ public class RegExpParser {
return new Result(root, errors);
}
public Result parse(String src, String flags) {
this.flags = flags;
return parse(src);
}
private static String fromCodePoint(int codepoint) {
if (Character.isValidCodePoint(codepoint)) return new String(Character.toChars(codepoint));
// replacement character