Merge pull request #745 from hvitved/csharp/query/missed-readonly-modifier

semmle-qlci · web-flow · commit b78fcd39be4d · 2019-01-14T08:43:59.000Z
Approved by calumgrant
diff --git a/csharp/ql/src/Language Abuse/MissedReadonlyOpportunity.ql b/csharp/ql/src/Language Abuse/MissedReadonlyOpportunity.ql
@@ -12,8 +12,12 @@
 
 import csharp
 
+predicate defTargetsField(AssignableDefinition def, Field f) {
+  def.getTarget().getSourceDeclaration() = f
+}
+
 predicate isReadonlyCompatibleDefinition(AssignableDefinition def, Field f) {
-  def.getTarget().getSourceDeclaration() = f and
+  defTargetsField(def, f) and
   (
     def.getEnclosingCallable().(Constructor).getDeclaringType() = f.getDeclaringType()
     or
@@ -22,7 +26,7 @@ predicate isReadonlyCompatibleDefinition(AssignableDefinition def, Field f) {
 }
 
 predicate canBeReadonly(Field f) {
-  forex(AssignableDefinition def | def.getTarget().getSourceDeclaration() = f |
+  forex(AssignableDefinition def | defTargetsField(def, f) |
     isReadonlyCompatibleDefinition(def, f)
   )
 }

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,12 @@`
`12`	`12`
`13`	`13`	`import csharp`
`14`	`14`
	`15`	`+predicate defTargetsField(AssignableDefinition def, Field f) {`
	`16`	`+ def.getTarget().getSourceDeclaration() = f`
	`17`	`+}`
	`18`	`+`
`15`	`19`	`predicate isReadonlyCompatibleDefinition(AssignableDefinition def, Field f) {`
`16`		`- def.getTarget().getSourceDeclaration() = f and`
	`20`	`+ defTargetsField(def, f) and`
`17`	`21`	`(`
`18`	`22`	`def.getEnclosingCallable().(Constructor).getDeclaringType() = f.getDeclaringType()`
`19`	`23`	`or`
`@@ -22,7 +26,7 @@ predicate isReadonlyCompatibleDefinition(AssignableDefinition def, Field f) {`
`22`	`26`	`}`
`23`	`27`
`24`	`28`	`predicate canBeReadonly(Field f) {`
`25`		`- forex(AssignableDefinition def \| def.getTarget().getSourceDeclaration() = f \|`
	`29`	`+ forex(AssignableDefinition def \| defTargetsField(def, f) \|`
`26`	`30`	`isReadonlyCompatibleDefinition(def, f)`
`27`	`31`	`)`
`28`	`32`	`}`