CheckBool::checkAssignBoolToFloat() - don't crash on unknown variables

amai2012 · amai2012 · commit e6a394d51475 · 2014-05-24T19:15:43.000+02:00
diff --git a/lib/checkbool.cpp b/lib/checkbool.cpp
@@ -485,8 +485,8 @@ void CheckBool::checkAssignBoolToFloat()
         const Scope * scope = symbolDatabase->functionScopes[i];
         for (const Token* tok = scope->classStart; tok != scope->classEnd; tok = tok->next()) {
             if (Token::Match(tok, "!!* %var% = %bool% ;")) {
-                const Variable *var = symbolDatabase->getVariableFromVarId(tok->next()->varId());
-                if (var->isFloatingType())
+                const Variable * const var = symbolDatabase->getVariableFromVarId(tok->next()->varId());
+                if (var && var->isFloatingType())
                     assignBoolToFloatError(tok->next());
             }
         }
diff --git a/test/testbool.cpp b/test/testbool.cpp
@@ -155,6 +155,12 @@ class TestBool : public TestFixture {
               "    long double d = (2>1);\n"
               "}");
         TODO_ASSERT_EQUALS("[test.cpp:2]: (style) Boolean value assigned to floating point variable.\n", "", errout.str());
+
+        // stability - don't crash:
+        check("void foo4() {\n"
+              "    unknown = false;\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void comparisonOfBoolExpressionWithInt1() {

Original file line number	Diff line number	Diff line change
`@@ -485,8 +485,8 @@ void CheckBool::checkAssignBoolToFloat()`
`485`	`485`	`const Scope * scope = symbolDatabase->functionScopes[i];`
`486`	`486`	`for (const Token* tok = scope->classStart; tok != scope->classEnd; tok = tok->next()) {`
`487`	`487`	`if (Token::Match(tok, "!!* %var% = %bool% ;")) {`
`488`		`- const Variable *var = symbolDatabase->getVariableFromVarId(tok->next()->varId());`
`489`		`- if (var->isFloatingType())`
	`488`	`+ const Variable * const var = symbolDatabase->getVariableFromVarId(tok->next()->varId());`
	`489`	`+ if (var && var->isFloatingType())`
`490`	`490`	`assignBoolToFloatError(tok->next());`
`491`	`491`	`}`
`492`	`492`	`}`