Merge branch 'main' into rp/pre32-c-650

Author: lcartey

c/cert/src/rules/INT30-C/UnsignedIntegerOperationsWrapAround.ql

@@ -15,24 +15,11 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.Overflow
-import semmle.code.cpp.controlflow.Guards
-import semmle.code.cpp.valuenumbering.GlobalValueNumbering
+import codingstandards.cpp.rules.unsignedoperationwithconstantoperandswraps.UnsignedOperationWithConstantOperandsWraps
 
-from InterestingOverflowingOperation op
-where
-  not isExcluded(op, IntegerOverflowPackage::unsignedIntegerOperationsWrapAroundQuery()) and
-  op.getType().getUnderlyingType().(IntegralType).isUnsigned() and
-  // Not within a guard condition
-  not exists(GuardCondition gc | gc.getAChild*() = op) and
-  // Not guarded by a check, where the check is not an invalid overflow check
-  not op.hasValidPreCheck() and
-  // Is not checked after the operation
-  not op.hasValidPostCheck() and
-  // Permitted by exception 3
-  not op instanceof LShiftExpr and
-  // Permitted by exception 2 - zero case is handled in separate query
-  not op instanceof DivExpr and
-  not op instanceof RemExpr
-select op,
-  "Operation " + op.getOperator() + " of type " + op.getType().getUnderlyingType() + " may wrap."
+class UnsignedIntegerOperationsWrapAroundQuery extends UnsignedOperationWithConstantOperandsWrapsSharedQuery
+{
+  UnsignedIntegerOperationsWrapAroundQuery() {
+    this = IntegerOverflowPackage::unsignedIntegerOperationsWrapAroundQuery()
+  }
+}

c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.expected

@@ -0,0 +1 @@
+c/common/test/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.ql

c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.qlref

@@ -1 +1 @@
-cpp/common/test/rules/donotuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql
+c/common/test/rules/donotuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql

c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.testref

@@ -1,2 +1,2 @@
-| test.c:4:1:4:41 | #define BAD_MACRO_WITH_ARG(x) (x) + wow ## x | Macro BAD_MACRO_WITH_ARG contains use of parameter x used in multiple contexts. |
-| test.c:5:1:5:48 | #define BAD_MACRO_WITH_ARG_TWO(x,y) (x) + wow ## x | Macro BAD_MACRO_WITH_ARG_TWO contains use of parameter x used in multiple contexts. |
+| test.c:5:1:5:41 | #define BAD_MACRO_WITH_ARG(x) (x) + wow ## x | Macro BAD_MACRO_WITH_ARG contains use of parameter x used in multiple contexts. |
+| test.c:6:1:6:48 | #define BAD_MACRO_WITH_ARG_TWO(x,y) (x) + wow ## x | Macro BAD_MACRO_WITH_ARG_TWO contains use of parameter x used in multiple contexts. |

c/cert/test/rules/MSC30-C/RandUsedForGeneratingPseudorandomNumbers.testref

@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.amixedusemacroargumentsubjecttoexpansion.AMixedUseMacroArgumentSubjectToExpansion
+
+class TestFileQuery extends AMixedUseMacroArgumentSubjectToExpansionSharedQuery, TestQuery { }

c/common/src/codingstandards/c/Literals.qll

@@ -0,0 +1,26 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+#define GOOD_MACRO_WITH_ARG(X) ((X)*X##_scale) // COMPLIANT
+#define MACRO 1
+#define BAD_MACRO_WITH_ARG(x) (x) + wow##x        // NON_COMPLIANT
+#define BAD_MACRO_WITH_ARG_TWO(x, y) (x) + wow##x // NON_COMPLIANT
+#define MACROONE(x) #x                            // COMPLIANT
+#define MACROTWO(x) x *x                          // COMPLIANT
+#define MACROTHREE(x) "##\"\"'" + (x)             // COMPLIANT
+#define FOO(x) #x MACROONE(x) // COMPLIANT - no further arg expansion
+
+void f() {
+
+  int x;
+  int x_scale;
+  int y;
+  int wowMACRO = 0;
+
+  y = GOOD_MACRO_WITH_ARG(x);
+  wowMACRO = BAD_MACRO_WITH_ARG(MACRO);
+  wowMACRO = BAD_MACRO_WITH_ARG_TWO(MACRO, 1);
+  char s[] = MACROONE(MACRO);
+  y = MACROTWO(MACRO);
+  MACROTHREE(MACRO);
+  FOO(x);
+}

c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.expected renamed to c/common/test/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.expected

@@ -0,0 +1,4 @@
+| test.c:8:14:8:17 | call to atof | Call to banned function atof. |
+| test.c:9:12:9:15 | call to atoi | Call to banned function atoi. |
+| test.c:10:13:10:16 | call to atol | Call to banned function atol. |
+| test.c:11:18:11:22 | call to atoll | Call to banned function atoll. |