hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-18 21:27:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix in selecting a node's location:

Browse Source 
Locations only exist where there are locatable structures in the DB. Thus, select the largest location that contains the node and at most `neighborhoodSize` lines before and after the node.
This commit is contained in:
tiferet
2022-12-07 16:28:43 -08:00
parent 7a8715d1ef
commit fbcfd523f4
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/ModelPrompt.qll
View File

@@ -98,23 +98,18 @@ module ModelPrompt {
bindingset[neighborhoodSize]
string tokenizeNeighborhood(DataFlow::Node node, int neighborhoodSize) {
result =
tokenize(any(Location location |
location.getFile() = node.getAstNode().getLocation().getFile() and
location.getStartLine() =
max(int line |
line = node.getAstNode().getLocation().getStartLine() - neighborhoodSize or line = 1
tokenize(max(Location loc |
// Select the largest neighborhood that contains `node` and at most `neighborhoodSize` lines before and after
// `node`.
loc.getFile() = node.getAstNode().getLocation().getFile() and
loc.containsLoosely(node.getAstNode().getLocation()) and
loc.getStartLine() >= node.getAstNode().getLocation().getStartLine() - neighborhoodSize and
loc.getEndLine() <= node.getAstNode().getLocation().getEndLine() + neighborhoodSize
|
line
) and
location.getEndLine() =
min(int line |
line = node.getAstNode().getLocation().getEndLine() + neighborhoodSize + 1 or // Add 1 because the end column is 1
line = location.getFile().getNumberOfLines()
|
line
) and
location.getStartColumn() = 1 and
location.getEndColumn() = 1
loc
order by
loc.getNumLines(), loc.getEndColumn() - loc.getStartColumn(), loc.getEndColumn(),
loc.getStartColumn() desc
))
}
}