C#: Use DataFlow3 instead of DataFlow2 in Xml.qll to avoid overlap

hvitved · hvitved · commit 357109a410e2 · 2020-08-14T14:33:12.000+02:00
`semmle.code.csharp.frameworks.system.Xml` is imported in `LibraryTypeDataFlow.qll`,
and therefore part of the default namespace. This means that the use of `DataFlow2`
inside `Xml.qll` overlaps with some queries. Bumping to `DataFlow3` resolves the issue.
diff --git a/csharp/ql/src/semmle/code/csharp/frameworks/system/Xml.qll b/csharp/ql/src/semmle/code/csharp/frameworks/system/Xml.qll
@@ -2,7 +2,7 @@
 
 import csharp
 private import semmle.code.csharp.frameworks.System
-private import semmle.code.csharp.dataflow.DataFlow2
+private import semmle.code.csharp.dataflow.DataFlow3
 
 /** The `System.Xml` namespace. */
 class SystemXmlNamespace extends Namespace {
@@ -163,7 +163,7 @@ class XmlReaderSettingsCreation extends ObjectCreation {
   }
 }
 
-private class SettingsDataFlowConfig extends DataFlow2::Configuration {
+private class SettingsDataFlowConfig extends DataFlow3::Configuration {
   SettingsDataFlowConfig() { this = "SettingsDataFlowConfig" }
 
   override predicate isSource(DataFlow::Node source) {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`import csharp`
`4`	`4`	`private import semmle.code.csharp.frameworks.System`
`5`		`-private import semmle.code.csharp.dataflow.DataFlow2`
	`5`	`+private import semmle.code.csharp.dataflow.DataFlow3`
`6`	`6`
`7`	`7`	/** The `System.Xml` namespace. */
`8`	`8`	`class SystemXmlNamespace extends Namespace {`
`@@ -163,7 +163,7 @@ class XmlReaderSettingsCreation extends ObjectCreation {`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`
`166`		`-private class SettingsDataFlowConfig extends DataFlow2::Configuration {`
	`166`	`+private class SettingsDataFlowConfig extends DataFlow3::Configuration {`
`167`	`167`	`SettingsDataFlowConfig() { this = "SettingsDataFlowConfig" }`
`168`	`168`
`169`	`169`	`override predicate isSource(DataFlow::Node source) {`