Ticket danmar#6713: Properly detect ternary operator in valueFlowForward.

simartin · simartin · commit 98e6dca4f202 · 2015-05-30T20:55:36.000+02:00
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -1043,6 +1043,8 @@ static bool valueFlowForward(Token * const               startToken,
         // If a ? is seen and it's known that the condition is true/false..
         else if (tok2->str() == "?") {
             const Token *condition = tok2->astOperand1();
+            if (!condition) // Ticket #6713
+                continue;
             std::list<ValueFlow::Value>::const_iterator it;
             for (it = values.begin(); it != values.end(); ++it) {
                 const std::map<unsigned int, MathLib::bigint> programMemory(getProgramMemory(tok2, varid, *it));
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
@@ -94,6 +94,7 @@ class TestGarbage : public TestFixture {
         TEST_CASE(garbageCode53); // #6721
         TEST_CASE(garbageCode54); // #6722
         TEST_CASE(garbageCode55); // #6724
+        TEST_CASE(garbageCode56); // #6713
 
         TEST_CASE(garbageValueFlow);
         TEST_CASE(garbageSymbolDatabase);
@@ -535,6 +536,10 @@ class TestGarbage : public TestFixture {
         checkCode("() __attribute__((constructor)); { } { }");
     }
 
+    void garbageCode56() { // #6713
+        checkCode("void foo() { int a = 0; int b = ???; }");
+    }
+
     void garbageValueFlow() {
         // #6089
         const char* code = "{} int foo(struct, x1, struct x2, x3, int, x5, x6, x7)\n"
