Fix ExtraGeneratedConstructor to exclude static constructors and take into account generic derived classes

tamasvajk · tamasvajk · commit 4e0bbffac43b · 2021-06-23T09:26:53.000+02:00
diff --git a/csharp/ql/src/Stubs/Stubs.qll b/csharp/ql/src/Stubs/Stubs.qll
@@ -204,6 +204,7 @@ private class InheritedMember extends GeneratedMember, Virtualizable {
 
 private class ExtraGeneratedConstructor extends GeneratedMember, Constructor {
   ExtraGeneratedConstructor() {
+    not this.isStatic() and
     not this.isEffectivelyPublic() and
     this.getDeclaringType() instanceof GeneratedType and
     (
@@ -212,10 +213,10 @@ private class ExtraGeneratedConstructor extends GeneratedMember, Constructor {
         c = this.getDeclaringType().getBaseClass().getAMember() and c.getNumberOfParameters() = 0
       )
       or
-      // if this constructor might be called from a derived class
+      // if this constructor might be called from a (generic) derived class
       exists(Class c |
-        c.getBaseClass() = this.getDeclaringType() and
-        this = getBaseConstructor(c)
+        this.getDeclaringType() = c.getBaseClass().getUnboundDeclaration() and
+        this = getBaseConstructor(c).getUnboundDeclaration()
       )
     )
   }

Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,7 @@ private class InheritedMember extends GeneratedMember, Virtualizable {`
`204`	`204`
`205`	`205`	`private class ExtraGeneratedConstructor extends GeneratedMember, Constructor {`
`206`	`206`	`ExtraGeneratedConstructor() {`
	`207`	`+ not this.isStatic() and`
`207`	`208`	`not this.isEffectivelyPublic() and`
`208`	`209`	`this.getDeclaringType() instanceof GeneratedType and`
`209`	`210`	`(`
`@@ -212,10 +213,10 @@ private class ExtraGeneratedConstructor extends GeneratedMember, Constructor {`
`212`	`213`	`c = this.getDeclaringType().getBaseClass().getAMember() and c.getNumberOfParameters() = 0`
`213`	`214`	`)`
`214`	`215`	`or`
`215`		`- // if this constructor might be called from a derived class`
	`216`	`+ // if this constructor might be called from a (generic) derived class`
`216`	`217`	`exists(Class c \|`
`217`		`- c.getBaseClass() = this.getDeclaringType() and`
`218`		`- this = getBaseConstructor(c)`
	`218`	`+ this.getDeclaringType() = c.getBaseClass().getUnboundDeclaration() and`
	`219`	`+ this = getBaseConstructor(c).getUnboundDeclaration()`
`219`	`220`	`)`
`220`	`221`	`)`
`221`	`222`	`}`