hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 03:05:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix extra constructor stubbing

Browse Source
This commit is contained in:
Tamas Vajk
2021-06-18 15:55:17 +02:00
parent 2dc0849b79
commit 1188e1b678
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
csharp/ql/src/Stubs/Stubs.qll
View File

@@ -186,13 +186,23 @@ abstract private class GeneratedType extends Type, GeneratedElement {
string stubPrivateConstructor() {
if
this instanceof Interface or
this.isStatic() or
this.isAbstract() or
exists(this.(ValueOrRefType).getAConstructor()) or
not exists(this.getAnInterestingBaseType()) or
not exists(this.getAnInterestingBaseType().getAConstructor()) or
this.getAnInterestingBaseType().getAConstructor().getNumberOfParameters() = 0
this instanceof Interface
or
this.isStatic()
or
this.isAbstract()
or
exists(this.(ValueOrRefType).getAConstructor())
or
not exists(this.getAnInterestingBaseType())
or
not exists(this.getAnInterestingBaseType().getAConstructor())
or
exists(Constructor bc |
bc = this.getAnInterestingBaseType().getAConstructor() and
bc.getNumberOfParameters() = 0 and
not bc.isStatic()
)
then result = ""
else
result =
@@ -287,7 +297,9 @@ private class ExtraGeneratedConstructor extends GeneratedMember, Constructor {
(
// if the base class has no 0 parameter constructor
not exists(Constructor c |
c = this.getDeclaringType().getBaseClass().getAMember() and c.getNumberOfParameters() = 0
c = this.getDeclaringType().getBaseClass().getAMember() and
c.getNumberOfParameters() = 0 and
not c.isStatic()
)
or
// if this constructor might be called from a (generic) derived class