C++: Fix mistakes in models of internal strcat and strcpy functions.

Author: Product Timeline Template Powerpoint

cpp/ql/lib/semmle/code/cpp/models/implementations/Strcat.qll

@@ -58,11 +58,7 @@ class StrcatFunction extends TaintFunction, DataFlowFunction, ArrayFunction, Sid
 
  override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
  (
- this.getName() =
- [
- "strncat", "wcsncat", "_mbsncat", "_mbsncat_l", "__builtin___strncat_chk",
- "__builtin___strcat_chk"
- ] and
+ this.getName() = ["strncat", "wcsncat", "_mbsncat", "_mbsncat_l", "__builtin___strncat_chk"] and
  input.isParameter(2)
  or
  this.getName() = ["_mbsncat_l", "_mbsnbcat_l"] and

cpp/ql/lib/semmle/code/cpp/models/implementations/Strcpy.qll

@@ -73,11 +73,7 @@ class StrcpyFunction extends ArrayFunction, DataFlowFunction, TaintFunction, Sid
  if this.isSVariant()
  then result = 1
  else (
- this.getName()
- .matches([
- "%ncpy%", "%nbcpy%", "%xfrm%", "strlcpy", "__builtin___strcpy_chk",
- "__builtin___stpcpy_chk", "__builtin___stpncpy_chk", "__builtin___strncpy_chk"
- ]) and
+ this.getName().matches(["%ncpy%", "%nbcpy%", "%xfrm%", "strlcpy"]) and
  result = 2
  )
  }