fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Fix #1…

…1311 Do not search for null pointer in dead code
danmar · Jun 1, 2024 · 1e36c26 · 1e36c26
1 parent 13b2cab
commit 1e36c26
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/checknullpointer.cpp b/lib/checknullpointer.cpp
@@ -410,10 +410,15 @@ const Token * CheckNullPointer::nullPointerByDeRefAndCheck(const Token *start, c
             }
         } else if (Token::simpleMatch(tok, "?") && Token::simpleMatch(tok->astOperand2(), ":")) {  // ternary operator
             const Token *condTok = tok->astOperand1();
+            const Token *colonTok = tok->astOperand2();
 
             if (condTok->hasKnownIntValue() && !condTok->getKnownIntValue()) {
                 /* Skip true branch */
-                tok = tok->astOperand2();
+                tok = colonTok;
+            } else {
+                /* Analyze true branch and skip the other branch */
+                nullPointerByDeRefAndCheck(tok->next(), colonTok, printInconclusive);
+                tok = nextAfterAstRightmostLeaf(colonTok);
             }
         } else {
             if (isUnevaluated(tok)) {