Address review comment

Author: mbaluda

c/cert/src/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.ql

@@ -34,7 +34,7 @@ class AbortCall extends FunctionCall {
  * `if (signal(SIGINT, handler) == SIG_ERR)`
  */
 class SignalCheckOperation extends EqualityOperation, GuardCondition {
-  ControlFlowNode errorSuccessor;
+  BasicBlock errorSuccessor;
 
   SignalCheckOperation() {
     this.getAnOperand() = any(MacroInvocation m | m.getMacroName() = "SIG_ERR").getExpr() and
@@ -47,11 +47,11 @@ class SignalCheckOperation extends EqualityOperation, GuardCondition {
     )
   }
 
-  ControlFlowNode getCheckedSuccessor() {
+  BasicBlock getCheckedSuccessor() {
     result != errorSuccessor and result = this.getASuccessor()
   }
 
-  ControlFlowNode getErrorSuccessor() { result = errorSuccessor }
+  BasicBlock getErrorSuccessor() { result = errorSuccessor }
 }
 
 /**
@@ -71,7 +71,7 @@ class SignalCallingHandler extends Function {
       // does not abort on error
       not exists(SignalCheckOperation sCheck, AbortCall abort |
         DataFlow::localExprFlow(sCall, sCheck.getAnOperand()) and
-        abort.getEnclosingElement*() = sCheck.getErrorSuccessor()
+        abort = sCheck.getErrorSuccessor().(BlockStmt).getStmt(0).(ExprStmt).getExpr()
       )
     )
   }

c/cert/test/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.expected

@@ -1,5 +1,7 @@
 | test.c:12:5:12:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:10:21:10:26 | call to signal | call to signal |
-| test.c:39:5:39:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:35:21:35:26 | call to signal | call to signal |
-| test.c:46:5:46:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:44:21:44:26 | call to signal | call to signal |
-| test.c:62:5:62:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:54:17:54:22 | call to signal | call to signal |
-| test.c:62:5:62:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:58:17:58:22 | call to signal | call to signal |
+| test.c:30:5:30:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:26:21:26:26 | call to signal | call to signal |
+| test.c:49:5:49:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:45:21:45:26 | call to signal | call to signal |
+| test.c:56:5:56:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:54:21:54:26 | call to signal | call to signal |
+| test.c:74:5:74:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:64:17:64:22 | call to signal | call to signal |
+| test.c:74:5:74:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:66:17:66:22 | call to signal | call to signal |
+| test.c:74:5:74:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:70:17:70:22 | call to signal | call to signal |

c/cert/test/rules/ERR32-C/test.c

@@ -13,11 +13,21 @@ void handler1(int signum) {
   }
 }
 
-void handler2(int signum) {
+void handler2a(int signum) {
   pfv old_handler = signal(signum, SIG_DFL);
   if (old_handler != SIG_ERR) {
     perror(""); // COMPLIANT
   } else {
+    abort(); // COMPLIANT
+  }
+}
+
+void handler2b(int signum) {
+  pfv old_handler = signal(signum, SIG_DFL);
+  if (old_handler != SIG_ERR) {
+    perror(""); // COMPLIANT
+  } else {
+    perror(""); // NON_COMPLIANT
     abort();
   }
 }
@@ -46,11 +56,13 @@ int main(void) {
     perror(""); // NON_COMPLIANT
   }
 
-  old_handler = signal(SIGINT, handler2);
+  old_handler = signal(SIGINT, handler2a);
   if (old_handler == SIG_ERR) {
     perror(""); // COMPLIANT
   }
 
+  old_handler = signal(SIGINT, handler2b);
+
   old_handler = signal(SIGINT, handler3);
 
   old_handler = signal(SIGINT, handler4);