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

Use string instead of @file in XML discards

Browse Source
This commit is contained in:
Asger F
2025-11-28 09:23:27 +01:00
parent dbf14c190a
commit 38a1bb0e29
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
java/ql/lib/semmle/code/java/internal/OverlayXml.qll
View File

@@ -7,13 +7,14 @@ module;
*/ */
private predicate isOverlay() { databaseMetadata("isOverlay", "true") } private predicate isOverlay() { databaseMetadata("isOverlay", "true") }
private @file getXmlFile(@xmllocatable locatable) { private string getXmlFile(@xmllocatable locatable) {
exists(@location_default location | xmllocations(locatable, location) | exists(@location_default location, @file file | xmllocations(locatable, location) |
locations_default(location, result, _, _, _, _) locations_default(location, file, _, _, _, _) and
files(file, result)
) )
} }
private @file getXmlFileInBase(@xmllocatable locatable) { private string getXmlFileInBase(@xmllocatable locatable) {
not isOverlay() and not isOverlay() and
result = getXmlFile(locatable) result = getXmlFile(locatable)
} }
@@ -22,7 +23,7 @@ private @file getXmlFileInBase(@xmllocatable locatable) {
* Holds if the given `file` was extracted as part of the overlay and was extracted by the HTML/XML * Holds if the given `file` was extracted as part of the overlay and was extracted by the HTML/XML
* extractor. * extractor.
*/ */
private predicate overlayXmlExtracted(@file file) { private predicate overlayXmlExtracted(string file) {
isOverlay() and isOverlay() and
exists(@xmllocatable locatable | exists(@xmllocatable locatable |
not files(locatable, _) and not xmlNs(locatable, _, _, _) and file = getXmlFile(locatable) not files(locatable, _) and not xmlNs(locatable, _, _, _) and file = getXmlFile(locatable)
@@ -35,8 +36,8 @@ private predicate overlayXmlExtracted(@file file) {
*/ */
overlay[discard_entity] overlay[discard_entity]
private predicate discardXmlLocatable(@xmllocatable locatable) { private predicate discardXmlLocatable(@xmllocatable locatable) {
exists(@file file | file = getXmlFileInBase(locatable) | exists(string file | file = getXmlFileInBase(locatable) |
exists(string path | files(file, path) | overlayChangedFiles(path)) overlayChangedFiles(file)
or or
// The HTML/XML extractor is currently not incremental and may extract more files than those // The HTML/XML extractor is currently not incremental and may extract more files than those
// included in overlayChangedFiles. // included in overlayChangedFiles.