Merge branch 'main' into jeongsoolee09/MISRA-C++-2023-Banned856

jeongsoolee09 · web-flow · commit 97637a4fbdf2 · 2026-04-09T14:25:30.000-04:00
diff --git a/c/cert/src/qlpack.yml b/c/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards
-version: 2.57.0-dev
+version: 2.58.0-dev
 description: CERT C 2016
 suites: codeql-suites
 license: MIT
diff --git a/c/cert/test/qlpack.yml b/c/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards-tests
-version: 2.57.0-dev
+version: 2.58.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/common/src/qlpack.yml b/c/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards
-version: 2.57.0-dev
+version: 2.58.0-dev
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
diff --git a/c/common/test/qlpack.yml b/c/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards-tests
-version: 2.57.0-dev
+version: 2.58.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/misra/src/qlpack.yml b/c/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards
-version: 2.57.0-dev
+version: 2.58.0-dev
 description: MISRA C 2012
 suites: codeql-suites
 license: MIT
diff --git a/c/misra/test/qlpack.yml b/c/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards-tests
-version: 2.57.0-dev
+version: 2.58.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/autosar/src/qlpack.yml b/cpp/autosar/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards
-version: 2.57.0-dev
+version: 2.58.0-dev
 description: AUTOSAR C++14 Guidelines R22-11, R21-11, R20-11, R19-11 and R19-03
 suites: codeql-suites
 license: MIT
diff --git a/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql b/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql
@@ -17,10 +17,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.functiondeclaredatblockscope.FunctionDeclaredAtBlockScope
 
-from DeclStmt decl, Function f
-where
-  not isExcluded(decl, DeclarationsPackage::functionsDeclaredAtBlockScopeQuery()) and
-  not isExcluded(f, DeclarationsPackage::functionsDeclaredAtBlockScopeQuery()) and
-  decl.getADeclaration() = f
-select f, "Function " + f.getName() + " is declared at block scope."
+module FunctionDeclaredAtBlockScopeConfig implements FunctionDeclaredAtBlockScopeConfigSig {
+  Query getQuery() { result = DeclarationsPackage::functionsDeclaredAtBlockScopeQuery() }
+}
+
+import FunctionDeclaredAtBlockScope<FunctionDeclaredAtBlockScopeConfig>
diff --git a/cpp/autosar/test/qlpack.yml b/cpp/autosar/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards-tests
-version: 2.57.0-dev
+version: 2.58.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/autosar/test/rules/M3-1-2/FunctionsDeclaredAtBlockScope.qlref b/cpp/autosar/test/rules/M3-1-2/FunctionsDeclaredAtBlockScope.qlref
diff --git a/cpp/autosar/test/rules/M3-1-2/FunctionsDeclaredAtBlockScope.testref b/cpp/autosar/test/rules/M3-1-2/FunctionsDeclaredAtBlockScope.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.ql
diff --git a/cpp/cert/src/qlpack.yml b/cpp/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards
-version: 2.57.0-dev
+version: 2.58.0-dev
 description: CERT C++ 2016
 suites: codeql-suites
 license: MIT
diff --git a/cpp/cert/test/qlpack.yml b/cpp/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards-tests
-version: 2.57.0-dev
+version: 2.58.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Declarations3.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Declarations3.qll
@@ -0,0 +1,44 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype Declarations3Query =
+  TVariableDeclaredArrayTypeQuery() or
+  TBlockScopeFunctionAmbiguousQuery()
+
+predicate isDeclarations3QueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `variableDeclaredArrayType` query
+    Declarations3Package::variableDeclaredArrayTypeQuery() and
+  queryId =
+    // `@id` for the `variableDeclaredArrayType` query
+    "cpp/misra/variable-declared-array-type" and
+  ruleId = "RULE-11-3-1" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `blockScopeFunctionAmbiguous` query
+    Declarations3Package::blockScopeFunctionAmbiguousQuery() and
+  queryId =
+    // `@id` for the `blockScopeFunctionAmbiguous` query
+    "cpp/misra/block-scope-function-ambiguous" and
+  ruleId = "RULE-6-0-1" and
+  category = "required"
+}
+
+module Declarations3Package {
+  Query variableDeclaredArrayTypeQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `variableDeclaredArrayType` query
+      TQueryCPP(TDeclarations3PackageQuery(TVariableDeclaredArrayTypeQuery()))
+  }
+
+  Query blockScopeFunctionAmbiguousQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `blockScopeFunctionAmbiguous` query
+      TQueryCPP(TDeclarations3PackageQuery(TBlockScopeFunctionAmbiguousQuery()))
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/RuleMetadata.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/RuleMetadata.qll
@@ -37,6 +37,7 @@ import DeadCode9
 import Declarations
 import Declarations1
 import Declarations2
+import Declarations3
 import ExceptionSafety
 import Exceptions1
 import Exceptions2
@@ -137,6 +138,7 @@ newtype TCPPQuery =
   TDeclarationsPackageQuery(DeclarationsQuery q) or
   TDeclarations1PackageQuery(Declarations1Query q) or
   TDeclarations2PackageQuery(Declarations2Query q) or
+  TDeclarations3PackageQuery(Declarations3Query q) or
   TExceptionSafetyPackageQuery(ExceptionSafetyQuery q) or
   TExceptions1PackageQuery(Exceptions1Query q) or
   TExceptions2PackageQuery(Exceptions2Query q) or
@@ -237,6 +239,7 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isDeclarationsQueryMetadata(query, queryId, ruleId, category) or
   isDeclarations1QueryMetadata(query, queryId, ruleId, category) or
   isDeclarations2QueryMetadata(query, queryId, ruleId, category) or
+  isDeclarations3QueryMetadata(query, queryId, ruleId, category) or
   isExceptionSafetyQueryMetadata(query, queryId, ruleId, category) or
   isExceptions1QueryMetadata(query, queryId, ruleId, category) or
   isExceptions2QueryMetadata(query, queryId, ruleId, category) or
diff --git a/cpp/common/src/codingstandards/cpp/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.qll b/cpp/common/src/codingstandards/cpp/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.qll
@@ -0,0 +1,25 @@
+/**
+ * Provides a configurable module FunctionDeclaredAtBlockScope with a `problems` predicate
+ * for the following issue:
+ * A function declared at block scope can make code harder to read and may lead to
+ * developer confusion.
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+signature module FunctionDeclaredAtBlockScopeConfigSig {
+  Query getQuery();
+}
+
+module FunctionDeclaredAtBlockScope<FunctionDeclaredAtBlockScopeConfigSig Config> {
+  query predicate problems(Function f, string message) {
+    exists(DeclStmt decl |
+      not isExcluded(decl, Config::getQuery()) and
+      not isExcluded(f, Config::getQuery()) and
+      decl.getADeclaration() = f and
+      message = "Function " + f.getName() + " is declared at block scope."
+    )
+  }
+}
diff --git a/cpp/common/src/qlpack.yml b/cpp/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards
-version: 2.57.0-dev
+version: 2.58.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 5.0.0
diff --git a/cpp/common/test/includes/standard-library/string_view b/cpp/common/test/includes/standard-library/string_view
@@ -75,6 +75,13 @@ typedef basic_string_view<wchar_t> wstring_view;
 typedef basic_string_view<char16_t> u16string_view;
 typedef basic_string_view<char32_t> u32string_view;
 
+inline namespace literals {
+inline namespace string_view_literals {
+// suffix for basic_string_view literals
+constexpr string_view operator""sv(const char *str, size_t len) noexcept;
+} // namespace string_view_literals
+} // namespace literals
+
 } // namespace std
 
 #endif // _GHLIBCPP_STRING_VIEW
diff --git a/cpp/common/test/qlpack.yml b/cpp/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards-tests
-version: 2.57.0-dev
+version: 2.58.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/common/test/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.expected b/cpp/common/test/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.expected
diff --git a/cpp/common/test/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.ql b/cpp/common/test/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.ql
@@ -0,0 +1,8 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.functiondeclaredatblockscope.FunctionDeclaredAtBlockScope
+
+module TestFileConfig implements FunctionDeclaredAtBlockScopeConfigSig {
+  Query getQuery() { result instanceof TestQuery }
+}
+
+import FunctionDeclaredAtBlockScope<TestFileConfig>
diff --git a/cpp/common/test/rules/functiondeclaredatblockscope/test.cpp b/cpp/common/test/rules/functiondeclaredatblockscope/test.cpp
diff --git a/cpp/misra/src/qlpack.yml b/cpp/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards
-version: 2.57.0-dev
+version: 2.58.0-dev
 description: MISRA C++ 2023
 default-suite: codeql-suites/misra-cpp-default.qls
 license: MIT
diff --git a/cpp/misra/src/rules/RULE-11-3-1/VariableDeclaredArrayType.ql b/cpp/misra/src/rules/RULE-11-3-1/VariableDeclaredArrayType.ql
@@ -0,0 +1,35 @@
+/**
+ * @id cpp/misra/variable-declared-array-type
+ * @name RULE-11-3-1: Variables of array type should not be declared
+ * @description Using array type instead of container types can lead to difficulty manually managing
+ *              size and accesses.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-11-3-1
+ *       correctness
+ *       maintainability
+ *       readability
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.cpp.misra
+
+class FixedSizeCharArray extends Variable {
+  FixedSizeCharArray() {
+    this.isStatic() and
+    this.getUnspecifiedType().stripType() instanceof CharType and
+    this.getInitializer().getExpr() instanceof StringLiteral
+  }
+}
+
+from Variable v
+where
+  not isExcluded(v, Declarations3Package::variableDeclaredArrayTypeQuery()) and
+  exists(ArrayType a | v.getType() = a | not v instanceof FixedSizeCharArray) and
+  // Exclude the compiler generated __func__ as it is the only way to access the function name information
+  not v.getName() = "__func__"
+select v, "Variable " + v.getName() + " has an array type."
diff --git a/cpp/misra/src/rules/RULE-6-0-1/BlockScopeFunctionAmbiguous.ql b/cpp/misra/src/rules/RULE-6-0-1/BlockScopeFunctionAmbiguous.ql
@@ -0,0 +1,25 @@
+/**
+ * @id cpp/misra/block-scope-function-ambiguous
+ * @name RULE-6-0-1: Block scope declarations shall not be visually ambiguous
+ * @description A function declared at block scope can make code harder to read and may lead to
+ *              developer confusion.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/misra/id/rule-6-0-1
+ *       maintainability
+ *       readability
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.functiondeclaredatblockscope.FunctionDeclaredAtBlockScope
+
+module BlockScopeFunctionAmbiguousConfig implements FunctionDeclaredAtBlockScopeConfigSig {
+  Query getQuery() { result = Declarations3Package::blockScopeFunctionAmbiguousQuery() }
+}
+
+import FunctionDeclaredAtBlockScope<BlockScopeFunctionAmbiguousConfig>
diff --git a/cpp/misra/test/qlpack.yml b/cpp/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards-tests
-version: 2.57.0-dev
+version: 2.58.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/misra/test/rules/RULE-11-3-1/VariableDeclaredArrayType.expected b/cpp/misra/test/rules/RULE-11-3-1/VariableDeclaredArrayType.expected
@@ -0,0 +1,9 @@
+| test.cpp:5:5:5:5 | g | Variable g has an array type. |
+| test.cpp:9:24:9:24 | a | Variable a has an array type. |
+| test.cpp:10:7:10:8 | a1 | Variable a1 has an array type. |
+| test.cpp:14:7:14:8 | a1 | Variable a1 has an array type. |
+| test.cpp:19:7:19:7 | x | Variable x has an array type. |
+| test.cpp:20:17:20:17 | a | Variable a has an array type. |
+| test.cpp:22:8:22:9 | x1 | Variable x1 has an array type. |
+| test.cpp:28:6:28:7 | g1 | Variable g1 has an array type. |
+| test.cpp:34:21:34:21 | p | Variable p has an array type. |
diff --git a/cpp/misra/test/rules/RULE-11-3-1/VariableDeclaredArrayType.qlref b/cpp/misra/test/rules/RULE-11-3-1/VariableDeclaredArrayType.qlref
@@ -0,0 +1 @@
+rules/RULE-11-3-1/VariableDeclaredArrayType.ql
diff --git a/cpp/misra/test/rules/RULE-11-3-1/test.cpp b/cpp/misra/test/rules/RULE-11-3-1/test.cpp
@@ -0,0 +1,36 @@
+
+#include <array>
+#include <string_view>
+
+int g[100]; // NON_COMPLIANT
+
+class C {
+public:
+  static constexpr int a[1]{0}; // NON_COMPLIANT
+  int a1[1];                    // NON_COMPLIANT
+};
+
+struct S {
+  int a1[1]; // NON_COMPLIANT
+};
+
+void test_c_arrays() {
+
+  int x[100];                 // NON_COMPLIANT
+  constexpr int a[]{0, 1, 2}; // NON_COMPLIANT
+  const size_t s{1};
+  char x1[s];             // NON_COMPLIANT
+  std::array<char, s> x2; // COMPLIANT
+
+  __func__; // COMPLIANT
+}
+
+char g1[] = "abc";       // NON_COMPLIANT
+const char g2[] = "abc"; // COMPLIANT
+
+using namespace std::literals;
+const auto g3 = "abc"sv; // COMPLIANT
+
+void param_test(int p[1], int (&p1)[1], int (*p2)[1],
+                int *p3) { // NON_COMPLIANT -- p, rest are compliant
+}
diff --git a/cpp/misra/test/rules/RULE-6-0-1/BlockScopeFunctionAmbiguous.testref b/cpp/misra/test/rules/RULE-6-0-1/BlockScopeFunctionAmbiguous.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.ql
diff --git a/cpp/report/src/qlpack.yml b/cpp/report/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/report-cpp-coding-standards
-version: 2.57.0-dev
+version: 2.58.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 5.0.0
diff --git a/docs/user_manual.md b/docs/user_manual.md
diff --git a/rule_packages/cpp/Declarations.json b/rule_packages/cpp/Declarations.json
diff --git a/rule_packages/cpp/Declarations3.json b/rule_packages/cpp/Declarations3.json
diff --git a/rules.csv b/rules.csv
