M6-5-2 M17-0-5

Author: mbaluda

cpp/autosar/src/rules/M17-0-5/SetjmpMacroAndTheLongjmpFunctionUsed.ql

@@ -16,7 +16,10 @@
 import cpp
 import codingstandards.cpp.autosar
 
-predicate isLongJumpCall(FunctionCall fc) { fc.getTarget().hasGlobalOrStdName("longjmp") }
+predicate isLongJumpCall(Locatable fc) {
+  fc.(FunctionCall).getTarget().hasGlobalOrStdName("longjmp") or
+  fc.(MacroInvocation).getMacroName() = "longjmp"
+}
 
 predicate isSetJumpCall(MacroInvocation mi) { mi.getMacroName() = "setjmp" }
 

cpp/autosar/src/rules/M6-5-2/tempfile

@@ -0,0 +1,4 @@
+| test.cpp:7:9:7:19 | setjmp(__env) | Use of banned setjmp macro. |
+| test.cpp:12:3:12:9 | longjmp(__env,__val) | Use of banned longjmp function. |
+| test.cpp:14:3:14:9 | longjmp(__env,__val) | Use of banned longjmp function. |
+| test.cpp:16:9:16:19 | setjmp(__env) | Use of banned setjmp macro. |

cpp/autosar/test/rules/M17-0-5/SetjmpMacroAndTheLongjmpFunctionUsed.expected.qcc

@@ -173,7 +173,8 @@ predicate isInvalidForLoopIncrementation(ForStmt forLoop, Variable v, VariableAc
     exists(EqualityOperation eop | eop.getAnOperand() = va)
     or
     exists(Call call |
-      call.getTarget() instanceof UserEqualityOperator and call.getQualifier() = va
+      call.getTarget() instanceof UserEqualityOperator and
+      [call.getQualifier(), call.getArgument(0)] = va
     )
   )
 }