C++/Python: Fix XMLFile.getPath and XMLFile.getFolder.

Max Schaefer · Max Schaefer · commit 47c1fc735888 · 2019-12-17T10:15:43.000Z
Previously, the former returned the file's stem (that is, basename without extension), and the latter never held.
diff --git a/cpp/ql/src/semmle/code/cpp/XML.qll b/cpp/ql/src/semmle/code/cpp/XML.qll
@@ -115,15 +115,13 @@ class XMLFile extends XMLParent, File {
   override string toString() { result = XMLParent.super.toString() }
 
   /** Gets the name of this XML file. */
-  override string getName() { files(this, result, _, _, _) }
+  override string getName() { result = File.super.getAbsolutePath() }
 
   /** Gets the path of this XML file. */
-  string getPath() { files(this, _, result, _, _) }
+  string getPath() { result = getAbsolutePath() }
 
   /** Gets the path of the folder that contains this XML file. */
-  string getFolder() {
-    result = this.getPath().substring(0, this.getPath().length() - this.getName().length())
-  }
+  string getFolder() { result = getParentContainer().getAbsolutePath() }
 
   /** Gets the encoding of this XML file. */
   string getEncoding() { xmlEncoding(this, result) }
diff --git a/python/ql/src/semmle/python/xml/XML.qll b/python/ql/src/semmle/python/xml/XML.qll
@@ -114,16 +114,14 @@ class XMLFile extends XMLParent, File {
   /** Gets a printable representation of this XML file. */
   override string toString() { result = XMLParent.super.toString() }
 
-  /** The name of this XML file. */
-  override string getName() { files(this, result, _, _, _) }
+  /** Gets the name of this XML file. */
+  override string getName() { result = File.super.getAbsolutePath() }
 
-  /** The path of this XML file. */
-  string getPath() { files(this, _, result, _, _) }
+  /** Gets the path of this XML file. */
+  string getPath() { result = getAbsolutePath() }
 
-  /** The path of the folder that contains this XML file. */
-  string getFolder() {
-    result = this.getPath().substring(0, this.getPath().length() - this.getName().length())
-  }
+  /** Gets the path of the folder that contains this XML file. */
+  string getFolder() { result = getParentContainer().getAbsolutePath() }
 
   /** Gets the encoding of this XML file. */
   string getEncoding() { xmlEncoding(this, result) }
