C#/Java: Include synthetic fields in isRelevantContent.

michaelnebel · michaelnebel · commit 5d03e510d242 · 2022-03-14T13:49:51.000+01:00
diff --git a/csharp/ql/src/utils/model-generator/ModelGeneratorUtilsSpecific.qll b/csharp/ql/src/utils/model-generator/ModelGeneratorUtilsSpecific.qll
@@ -70,6 +70,7 @@ predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
 }
 
 predicate isRelevantContent(DataFlow::Content f) {
+  isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or
   isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or
   f instanceof DataFlow::ElementContent
 }
diff --git a/java/ql/src/utils/model-generator/ModelGeneratorUtilsSpecific.qll b/java/ql/src/utils/model-generator/ModelGeneratorUtilsSpecific.qll
@@ -131,6 +131,7 @@ predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
 }
 
 predicate isRelevantContent(DataFlow::Content f) {
+  isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or
   isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or
   f instanceof DataFlow::ArrayContent or
   f instanceof DataFlow::CollectionContent or

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`predicate isRelevantContent(DataFlow::Content f) {`
	`73`	`+ isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or`
`73`	`74`	`isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or`
`74`	`75`	`f instanceof DataFlow::ElementContent`
`75`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`predicate isRelevantContent(DataFlow::Content f) {`
	`134`	`+ isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or`
`134`	`135`	`isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or`
`135`	`136`	`f instanceof DataFlow::ArrayContent or`
`136`	`137`	`f instanceof DataFlow::CollectionContent or`