fix all ql/counting-to-zero in some languages

erik-krogh · erik-krogh · commit 94a9b3e87351 · 2022-05-11T09:54:53.000+02:00
diff --git a/python/ql/src/Security/CWE-022/TarSlip.ql b/python/ql/src/Security/CWE-022/TarSlip.ql
@@ -85,7 +85,7 @@ class ExtractAllSink extends TaintSink {
 
   ExtractAllSink() {
     this = call.getFunction().(AttrNode).getObject("extractall") and
-    count(call.getAnArg()) = 0
+    not exists(call.getAnArg())
   }
 
   override predicate sinks(TaintKind kind) { kind instanceof OpenTarFile }
diff --git a/python/ql/src/analysis/Consistency.ql b/python/ql/src/analysis/Consistency.ql
@@ -194,7 +194,7 @@ predicate function_object_consistency(string clsname, string problem, string wha
   exists(FunctionObject func | clsname = func.getAQlClass() |
     what = func.getName() and
     (
-      count(func.descriptiveString()) = 0 and problem = "no descriptiveString()"
+      not exists(func.descriptiveString()) and problem = "no descriptiveString()"
       or
       exists(int c | c = strictcount(func.descriptiveString()) and c > 1 |
         problem = c + "descriptiveString()s"
diff --git a/ql/ql/src/queries/performance/ClassPredicateDoesntMentionThis.ql b/ql/ql/src/queries/performance/ClassPredicateDoesntMentionThis.ql
@@ -40,7 +40,7 @@ predicate isLiteralComparison(ComparisonFormula eq) {
       or
       exists(NewTypeBranch nt |
         rhs.(Call).getTarget() = nt and
-        count(nt.getField(_)) = 0
+        not exists(nt.getField(_))
       )
     )
   )
@@ -69,7 +69,7 @@ predicate isSingleton(Type ty) {
   or
   isSingleton(ty.getASuperType())
   or
-  exists(NewTypeBranch br | count(br.getField(_)) = 0 |
+  exists(NewTypeBranch br | not exists(br.getField(_)) |
     ty.(NewTypeBranchType).getDeclaration() = br
     or
     br = unique(NewTypeBranch br2 | br2 = ty.(NewTypeType).getDeclaration().getABranch())

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ class ExtractAllSink extends TaintSink {`
`85`	`85`
`86`	`86`	`ExtractAllSink() {`
`87`	`87`	`this = call.getFunction().(AttrNode).getObject("extractall") and`
`88`		`- count(call.getAnArg()) = 0`
	`88`	`+ not exists(call.getAnArg())`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`override predicate sinks(TaintKind kind) { kind instanceof OpenTarFile }`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ predicate function_object_consistency(string clsname, string problem, string wha`
`194`	`194`	`exists(FunctionObject func \| clsname = func.getAQlClass() \|`
`195`	`195`	`what = func.getName() and`
`196`	`196`	`(`
`197`		`- count(func.descriptiveString()) = 0 and problem = "no descriptiveString()"`
	`197`	`+ not exists(func.descriptiveString()) and problem = "no descriptiveString()"`
`198`	`198`	`or`
`199`	`199`	`exists(int c \| c = strictcount(func.descriptiveString()) and c > 1 \|`
`200`	`200`	`problem = c + "descriptiveString()s"`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ predicate isLiteralComparison(ComparisonFormula eq) {`
`40`	`40`	`or`
`41`	`41`	`exists(NewTypeBranch nt \|`
`42`	`42`	`rhs.(Call).getTarget() = nt and`
`43`		`- count(nt.getField(_)) = 0`
	`43`	`+ not exists(nt.getField(_))`
`44`	`44`	`)`
`45`	`45`	`)`
`46`	`46`	`)`
`@@ -69,7 +69,7 @@ predicate isSingleton(Type ty) {`
`69`	`69`	`or`
`70`	`70`	`isSingleton(ty.getASuperType())`
`71`	`71`	`or`
`72`		`- exists(NewTypeBranch br \| count(br.getField(_)) = 0 \|`
	`72`	`+ exists(NewTypeBranch br \| not exists(br.getField(_)) \|`
`73`	`73`	`ty.(NewTypeBranchType).getDeclaration() = br`
`74`	`74`	`or`
`75`	`75`	`br = unique(NewTypeBranch br2 \| br2 = ty.(NewTypeType).getDeclaration().getABranch())`