STR51-CPP: value_type

Author: mbaluda

cpp/cert/test/rules/STR51-CPP/tempfile

@@ -46,7 +46,7 @@ class BasicStringMemberFunctionDereferencedExpr extends BasicStringDereferencedE
       // basic_string::basic_string(const charT *, const Allocator &)
       f instanceof Constructor and
       f.getNumberOfParameters() <= 2 and
-      f.getParameter(0).getType() = stringType.getConstCharTPointer() and
+      f.getParameter(0).getType() = stringType.getValueType() and
       (
         f.getNumberOfParameters() = 2
         implies
@@ -58,23 +58,23 @@ class BasicStringMemberFunctionDereferencedExpr extends BasicStringDereferencedE
       // basic_string &basic_string::assign(const charT *)
       f.hasName(["append", "assign"]) and
       f.getNumberOfParameters() = 1 and
-      fc.getArgument(0).getType() = stringType.getConstCharTPointer() and
+      f.getParameter(0).getType() = stringType.getValueType() and
       this = fc.getArgument(0)
       or
       // basic_string &basic_string::insert(size_type, const charT *)
       f.hasName("insert") and
       f.getNumberOfParameters() = 2 and
-      fc.getArgument(0).getType() = stringType.getSizeType() and
-      fc.getArgument(1).getType() = stringType.getConstCharTPointer() and
+      f.getParameter(0).getType() = stringType.getSizeType() and
+      f.getParameter(1).getType() = stringType.getValueType() and
       this = fc.getArgument(1)
       or
       // basic_string &basic_string::replace(size_type, size_type, const charT *)
       // basic_string &basic_string::replace(const_iterator, const_iterator, const charT *)
       f.hasName("replace") and
       f.getNumberOfParameters() = 3 and
-      fc.getArgument(0).getType() = [stringType.getSizeType(), stringType.getConstIteratorType()] and
-      fc.getArgument(1).getType() = [stringType.getSizeType(), stringType.getConstIteratorType()] and
-      fc.getArgument(2).getType() = stringType.getConstCharTPointer() and
+      f.getParameter(0).getType() = [stringType.getSizeType(), stringType.getConstIteratorType()] and
+      f.getParameter(1).getType() = [stringType.getSizeType(), stringType.getConstIteratorType()] and
+      f.getParameter(2).getType() = stringType.getValueType() and
       this = fc.getArgument(2)
       or
       // size_type basic_string::find(const charT *, size_type)
@@ -87,24 +87,24 @@ class BasicStringMemberFunctionDereferencedExpr extends BasicStringDereferencedE
           "find", "rfind", "find_first_of", "find_last_of", "find_first_not_of", "find_last_not_of"
         ]) and
       f.getNumberOfParameters() = 2 and
-      fc.getArgument(0).getType() = stringType.getConstCharTPointer() and
-      fc.getArgument(1).getType() = stringType.getSizeType() and
+      f.getParameter(0).getType() = stringType.getValueType() and
+      f.getParameter(1).getType() = stringType.getSizeType() and
       this = fc.getArgument(0)
       or
       // int basic_string::compare(const charT *)
       // basic_string &basic_string::operator=(const charT *)
       // basic_string &basic_string::operator+=(const charT *)
       f.hasName(["compare", "operator=", "operator+="]) and
       f.getNumberOfParameters() = 1 and
-      fc.getArgument(0).getType() = stringType.getConstCharTPointer() and
+      f.getParameter(0).getType() = stringType.getValueType() and
       this = fc.getArgument(0)
       or
       // int basic_string::compare(size_type, size_type, const charT *)
       f.hasName("compare") and
       f.getNumberOfParameters() = 3 and
-      fc.getArgument(0).getType() = stringType.getSizeType() and
-      fc.getArgument(1).getType() = stringType.getSizeType() and
-      fc.getArgument(2).getType() = stringType.getConstCharTPointer() and
+      f.getParameter(0).getType() = stringType.getSizeType() and
+      f.getParameter(1).getType() = stringType.getSizeType() and
+      f.getParameter(2).getType() = stringType.getValueType() and
       this = fc.getArgument(2)
     )
   }
@@ -136,7 +136,7 @@ class BasicStringNonMemberFunctionDereferencedExpr extends BasicStringDereferenc
         ]) and
       f.getAParameter().getType().(ReferenceType).getBaseType().getUnspecifiedType() = stringType and
       exists(int param |
-        fc.getArgument(param).getType() = stringType.getConstCharTPointer() and
+        f.getParameter(param).getType() = stringType.getValueType() and
         this = fc.getArgument(param)
       )
     )

cpp/common/src/codingstandards/cpp/Dereferenced.qll

@@ -13,12 +13,12 @@ class StdBasicString extends ClassTemplateInstantiation {
   Type getAllocator() { result = getTemplateArgument(2) }
 
   /** Gets the `const charT*` type for this `basic_string` instantiation. */
-  PointerType getConstCharTPointer() {
+  PointerType getValueType() {
     exists(SpecifiedType specType |
       specType = result.getBaseType() and
-      specType.getBaseType() = getCharT() and
       specType.isConst() and
-      count(specType.getASpecifier()) = 1
+      count(specType.getASpecifier()) = 1 and
+      (specType.getBaseType() = getCharT() or specType.getBaseType().getName() = "value_type")
     )
   }