Java: Account for top-level res folders in AndroidLayoutXmlFile

hvitved · hvitved · commit 283231871185 · 2024-10-04T08:35:28.000+02:00
diff --git a/java/ql/lib/semmle/code/java/frameworks/android/Layout.qll b/java/ql/lib/semmle/code/java/frameworks/android/Layout.qll
@@ -6,7 +6,7 @@ private import semmle.code.java.dataflow.DataFlow
 
 /** An Android Layout XML file. */
 class AndroidLayoutXmlFile extends XmlFile {
-  AndroidLayoutXmlFile() { this.getRelativePath().matches("%/res/layout/%.xml") }
+  AndroidLayoutXmlFile() { this.getRelativePath().regexpMatch("(.*/)?res/layout/.*\\.xml") }
 }
 
 /** A component declared in an Android layout file. */

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ private import semmle.code.java.dataflow.DataFlow`
`6`	`6`
`7`	`7`	`/** An Android Layout XML file. */`
`8`	`8`	`class AndroidLayoutXmlFile extends XmlFile {`
`9`		`- AndroidLayoutXmlFile() { this.getRelativePath().matches("%/res/layout/%.xml") }`
	`9`	`+ AndroidLayoutXmlFile() { this.getRelativePath().regexpMatch("(./)?res/layout/.\\.xml") }`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`/** A component declared in an Android layout file. */`