Fixed crash on garbage code (cppcheck-opensource#7699)

PKEuS · PKEuS · commit e0838ff194b8 · 2016-08-21T11:06:48.000+02:00
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -362,7 +362,7 @@ static void setTokenValue(Token* tok, const ValueFlow::Value &value)
         setTokenValue(parent,value);
     }
 
-    else if (parent->str() == "?" && tok->str() == ":" && tok == parent->astOperand2()) {
+    else if (parent->str() == "?" && tok->str() == ":" && tok == parent->astOperand2() && parent->astOperand1()) {
         // is condition always true/false?
         if (parent->astOperand1()->values.size() == 1U && parent->astOperand1()->values.front().isKnown()) {
             const ValueFlow::Value &condvalue = parent->astOperand1()->values.front();
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
@@ -232,6 +232,7 @@ class TestGarbage : public TestFixture {
         TEST_CASE(garbageCode181);
         TEST_CASE(garbageCode182); // #4195
         TEST_CASE(garbageCode183); // #7505
+        TEST_CASE(garbageCode184); // #7699
         TEST_CASE(garbageValueFlow);
         TEST_CASE(garbageSymbolDatabase);
         TEST_CASE(garbageAST);
@@ -1521,6 +1522,13 @@ class TestGarbage : public TestFixture {
         ASSERT_THROW(checkCode("= { int } enum return { r = f() f(); }"), InternalError);
     }
 
+    void garbageCode184() { // #7699
+        checkCode("unsigned int AquaSalSystem::GetDisplayScreenCount() {\n"
+                  "    NSArray* pScreens = [NSScreen screens];\n"
+                  "    return pScreens ? [pScreens count] : 1;\n"
+                  "}");
+    }
+
 };
 
 REGISTER_TEST(TestGarbage)

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ static void setTokenValue(Token* tok, const ValueFlow::Value &value)`
`362`	`362`	`setTokenValue(parent,value);`
`363`	`363`	`}`
`364`	`364`
`365`		`- else if (parent->str() == "?" && tok->str() == ":" && tok == parent->astOperand2()) {`
	`365`	`+ else if (parent->str() == "?" && tok->str() == ":" && tok == parent->astOperand2() && parent->astOperand1()) {`
`366`	`366`	`// is condition always true/false?`
`367`	`367`	`if (parent->astOperand1()->values.size() == 1U && parent->astOperand1()->values.front().isKnown()) {`
`368`	`368`	`const ValueFlow::Value &condvalue = parent->astOperand1()->values.front();`