CTR55-CPP: generalize end check

Author: knewbury01

cpp/cert/src/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.ql

@@ -35,10 +35,9 @@ predicate sizeCheckedAbove(ContainerIteratorAccess it, IteratorSource source) {
  */
 predicate validEndBoundCheck(ContainerIteratorAccess it, IteratorSource source) {
   exists(
-    STLContainer c, BasicBlock b, GuardCondition l, ContainerIteratorAccess otherAccess,
-    IteratorSource end
+    ContainerAccessWithoutRangeCheck::ContainerEndCall end, BasicBlock b, GuardCondition l,
+    ContainerIteratorAccess otherAccess
   |
-    end = c.getAnIteratorEndFunctionCall() and
     //guard controls the access
     l.controls(b, _) and
     b.contains(it) and

cpp/common/src/codingstandards/cpp/rules/containeraccesswithoutrangecheck/ContainerAccessWithoutRangeCheck.qll

@@ -85,6 +85,16 @@ class ContainerEmptyCall extends FunctionCall {
   }
 }
 
+/**
+ * A call to either `end()` on a container.
+ */
+class ContainerEndCall extends FunctionCall {
+  ContainerEndCall() {
+    getTarget().getDeclaringType() instanceof ContainerType and
+    getTarget().getName() = "end"
+  }
+}
+
 /**
  * A call to either `size()` or `length()` on a container.
  */