Merge pull request #4515 from geoffw0/modelchanges1

C++: Changes to models library.

Author: jbj

cpp/ql/src/semmle/code/cpp/models/implementations/Pure.qll

@@ -5,32 +5,9 @@ import semmle.code.cpp.models.interfaces.SideEffect
 
 class PureStrFunction extends AliasFunction, ArrayFunction, TaintFunction, SideEffectFunction {
   PureStrFunction() {
-    exists(string name |
-      hasGlobalOrStdName(name) and
-      (
-        name = "atof" or
-        name = "atoi" or
-        name = "atol" or
-        name = "atoll" or
-        name = "strcasestr" or
-        name = "strchnul" or
-        name = "strchr" or
-        name = "strchrnul" or
-        name = "strstr" or
-        name = "strpbrk" or
-        name = "strcmp" or
-        name = "strcspn" or
-        name = "strncmp" or
-        name = "strrchr" or
-        name = "strspn" or
-        name = "strtod" or
-        name = "strtof" or
-        name = "strtol" or
-        name = "strtoll" or
-        name = "strtoq" or
-        name = "strtoul"
-      )
-    )
+    hasGlobalOrStdName(["atof", "atoi", "atol", "atoll", "strcasestr", "strchnul", "strchr",
+          "strchrnul", "strstr", "strpbrk", "strcmp", "strcspn", "strncmp", "strrchr", "strspn",
+          "strtod", "strtof", "strtol", "strtoll", "strtoq", "strtoul"])
   }
 
   override predicate hasArrayInput(int bufParam) {
@@ -81,22 +58,9 @@ class PureStrFunction extends AliasFunction, ArrayFunction, TaintFunction, SideE
 
 class StrLenFunction extends AliasFunction, ArrayFunction, SideEffectFunction {
   StrLenFunction() {
-    exists(string name |
-      hasGlobalOrStdName(name) and
-      (
-        name = "strlen" or
-        name = "strnlen" or
-        name = "wcslen"
-      )
-      or
-      hasGlobalName(name) and
-      (
-        name = "_mbslen" or
-        name = "_mbslen_l" or
-        name = "_mbstrlen" or
-        name = "_mbstrlen_l"
-      )
-    )
+    hasGlobalOrStdName(["strlen", "strnlen", "wcslen"])
+    or
+    hasGlobalName(["_mbslen", "_mbslen_l", "_mbstrlen", "_mbstrlen_l"])
   }
 
   override predicate hasArrayInput(int bufParam) {
@@ -126,15 +90,7 @@ class StrLenFunction extends AliasFunction, ArrayFunction, SideEffectFunction {
 }
 
 class PureFunction extends TaintFunction, SideEffectFunction {
-  PureFunction() {
-    exists(string name |
-      hasGlobalOrStdName(name) and
-      (
-        name = "abs" or
-        name = "labs"
-      )
-    )
-  }
+  PureFunction() { hasGlobalOrStdName(["abs", "labs"]) }
 
   override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
     exists(ParameterIndex i |

cpp/ql/src/semmle/code/cpp/models/implementations/SmartPointer.qll

@@ -17,7 +17,7 @@ class MakeUniqueOrShared extends TaintFunction {
     // Exclude the specializations of `std::make_shared` and `std::make_unique` that allocate arrays
     // since these just take a size argument, which we don't want to propagate taint through.
     not this.isArray() and
-    input.isParameter(_) and
+    input.isParameter([0 .. getNumberOfParameters() - 1]) and
     output.isReturnValue()
   }
 

cpp/ql/src/semmle/code/cpp/models/implementations/StdPair.qll

@@ -7,7 +7,7 @@ import semmle.code.cpp.models.interfaces.Taint
 /**
  * Additional model for `std::pair` constructors.
  */
-class StdPairConstructor extends Constructor, TaintFunction {
+private class StdPairConstructor extends Constructor, TaintFunction {
   StdPairConstructor() { this.hasQualifiedName("std", "pair", "pair") }
 
   /**
@@ -34,7 +34,7 @@ class StdPairConstructor extends Constructor, TaintFunction {
 /**
  * The standard pair `swap` function.
  */
-class StdPairSwap extends TaintFunction {
+private class StdPairSwap extends TaintFunction {
   StdPairSwap() { this.hasQualifiedName("std", "pair", "swap") }
 
   override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {