danmar#5811 false postive: (error) Null pointer dereference

amai2012 · amai2012 · commit 9dce9bddcbbd · 2014-05-17T18:18:20.000+02:00
diff --git a/lib/checknullpointer.cpp b/lib/checknullpointer.cpp
@@ -883,7 +883,7 @@ void CheckNullPointer::nullConstantDereference()
             else if (Token::simpleMatch(tok->previous(), ">> 0")) { // Only checking input stream operations is safe here, because otherwise 0 can be an integer as well
                 const Token* tok2 = tok->previous(); // Find start of statement
                 for (; tok2; tok2 = tok2->previous()) {
-                    if (Token::Match(tok2->previous(), ";|{|}|:"))
+                    if (Token::Match(tok2->previous(), ";|{|}|:|("))
                         break;
                 }
                 if (Token::simpleMatch(tok2, "std :: cin"))
@@ -1064,4 +1064,3 @@ void CheckNullPointer::nullPointerDefaultArgError(const Token *tok, const std::s
 {
     reportError(tok, Severity::warning, "nullPointer", "Possible null pointer dereference if the default parameter value is used: " + varname);
 }
-
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
@@ -2132,6 +2132,15 @@ class TestNullPointer : public TestFixture {
               "    std::cout << i;\n" // Its no char* (#4240)
               "}", true);
         ASSERT_EQUALS("", errout.str());
+
+        // #5811 false postive: (error) Null pointer dereference
+        check("using namespace std;\n"
+              "std::string itoip(int ip) {\n"
+              "    stringstream out;\n"
+              "    out << ((ip >> 0) & 0xFF);\n"
+              "    return out.str();\n"
+              "}n", true, "test.cpp", false);
+        ASSERT_EQUALS("", errout.str());
     }
 
     void functioncall() {    // #3443 - function calls

Original file line number	Diff line number	Diff line change
`@@ -883,7 +883,7 @@ void CheckNullPointer::nullConstantDereference()`
`883`	`883`	`else if (Token::simpleMatch(tok->previous(), ">> 0")) { // Only checking input stream operations is safe here, because otherwise 0 can be an integer as well`
`884`	`884`	`const Token* tok2 = tok->previous(); // Find start of statement`
`885`	`885`	`for (; tok2; tok2 = tok2->previous()) {`
`886`		`- if (Token::Match(tok2->previous(), ";\|{\|}\|:"))`
	`886`	`+ if (Token::Match(tok2->previous(), ";\|{\|}\|:\|("))`
`887`	`887`	`break;`
`888`	`888`	`}`
`889`	`889`	`if (Token::simpleMatch(tok2, "std :: cin"))`
`@@ -1064,4 +1064,3 @@ void CheckNullPointer::nullPointerDefaultArgError(const Token *tok, const std::s`
`1064`	`1064`	`{`
`1065`	`1065`	`reportError(tok, Severity::warning, "nullPointer", "Possible null pointer dereference if the default parameter value is used: " + varname);`
`1066`	`1066`	`}`
`1067`		`-`