Fix

Author: web-flow

lib/forwardanalyzer.cpp

@@ -208,11 +208,12 @@ namespace {
                 bool checkThen, checkElse;
                 std::tie(checkThen, checkElse) = evalCond(condTok);
                 if (!checkThen && !checkElse) {
+                    const bool oldAnalyzeOnly = analyzeOnly;
                     if (!traverseUnknown && stopOnCondition(condTok) && stopUpdates()) {
-                        if (tok->str() == "?")
-                            analyzeOnly = false;
                         return Progress::Continue;
                     }
+                    if (tok->str() == "?")
+                        analyzeOnly = oldAnalyzeOnly;
                     checkThen = true;
                     checkElse = true;
                 }

test/testnullpointer.cpp

@@ -3372,7 +3372,7 @@ class TestNullPointer : public TestFixture {
               "    if (!p) {}\n"
               "    return q ? p->x : 0;\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p.\n", "", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:16]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("int f(ABC *p) {\n" // FP : return &&
               "    if (!p) {}\n"