hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-24 04:36:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

compute concatenated string and offset at the same time

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2021-11-03 13:26:19 +01:00
parent be46c1f679
commit 1ba6f448cd
1 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -600,14 +600,18 @@ public class ASTExtractor {
return '0' <= ch && ch <= '7';
}
private String getStringConcatResult(Expression exp) {
private Pair<String, OffsetTranslation> getStringConcatResult(Expression exp) {
if (exp instanceof BinaryExpression) {
BinaryExpression be = (BinaryExpression) exp;
if (be.getOperator().equals("+")) {
String left = getStringConcatResult(be.getLeft());
String right = getStringConcatResult(be.getRight());
Pair<String, OffsetTranslation> left = getStringConcatResult(be.getLeft());
Pair<String, OffsetTranslation> right = getStringConcatResult(be.getRight());
if (left != null && right != null) {
return left + right;
String str = left.fst() + right.fst();
int delta = be.getRight().getLoc().getStart().getOffset() - be.getLeft().getLoc().getStart().getOffset();
int offset = left.fst().length();
return Pair.make(str, left.snd().append(right.snd(), offset, delta));
}
}
} else if (exp instanceof Literal) {
@@ -615,33 +619,11 @@ public class ASTExtractor {
if (!lit.isStringLiteral()) {
return null;
}
return lit.getStringValue();
return Pair.make(lit.getStringValue(), makeStringLiteralOffsets(lit.getRaw()));
}
return null;
}
private OffsetTranslation computeStringConcatOffset(Expression exp) {
if (exp instanceof Literal && ((Literal)exp).isStringLiteral()) {
String raw = ((Literal) exp).getRaw();
return makeStringLiteralOffsets(raw);
}
if (exp instanceof BinaryExpression) {
BinaryExpression be = (BinaryExpression) exp;
OffsetTranslation left = computeStringConcatOffset(be.getLeft());
OffsetTranslation right = computeStringConcatOffset(be.getRight());
if (left == null || right == null) {
return null;
}
int delta = be.getRight().getLoc().getStart().getOffset() - be.getLeft().getLoc().getStart().getOffset();
int offset = getStringConcatResult(be.getLeft()).length();
return left.append(right, offset, delta);
}
return null;
}
/**
* Builds a translation from offsets in a string value back to its original raw literal text
* (including quotes).
@@ -848,14 +830,15 @@ public class ASTExtractor {
if (extractedAsRegexp.contains(nd)) {
return key;
}
String rawString = getStringConcatResult(nd);
if (rawString == null) {
Pair<String, OffsetTranslation> concatResult = getStringConcatResult(nd);
if (concatResult == null) {
return key;
}
String rawString = concatResult.fst();
if (rawString.length() > 1000 && !rawString.trim().isEmpty()) {
return key;
}
OffsetTranslation offsets = computeStringConcatOffset(nd);
OffsetTranslation offsets = concatResult.snd();
Position start = nd.getLoc().getStart();
com.semmle.util.locations.Position startPos = new com.semmle.util.locations.Position(start.getLine(), start.getColumn(), start.getOffset());
SourceMap sourceMap = SourceMap.legacyWithStartPos(SourceMap.fromString(nd.getLoc().getSource()).offsetBy(0, offsets), startPos);