walkero/cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

#6189 assign with operator= a '\0' to a std::string is not an error

Browse Source
This commit is contained in:
Alexander Mai 2014-09-26 20:40:44 +02:00
parent de13ad7eca
commit 21c85118d6
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checknullpointer.cpp
View File

@ -431,7 +431,7 @@ void CheckNullPointer::nullConstantDereference()
ovar = tok->variable(); ovar = tok->variable();
else if (Token::Match(tok, "%var% =|+ 0 )|]|,|;|+")) else if (Token::Match(tok, "%var% =|+ 0 )|]|,|;|+"))
ovar = tok->variable(); ovar = tok->variable();
if (ovar && !ovar->isPointer() && !ovar->isArray() && ovar->isStlStringType()) if (ovar && !ovar->isPointer() && !ovar->isArray() && ovar->isStlStringType() && !tok->tokAt(2)->isLiteral())
nullPointerError(tok); nullPointerError(tok);
} }
} }

19
test/testnullpointer.cpp
View File

@ -2008,10 +2008,15 @@ private:
} }
void nullpointerStdString() { void nullpointerStdString() {
// line 3 and 5 don't seem to compile with recent compilers...
// To fix #6189 "assign with operator= a '\0' to a std::string is not an error" the result for those
// has been adjusted as well.
check("void f(std::string s1) {\n" check("void f(std::string s1) {\n"
" void* p = 0;\n" " void* p = 0;\n"
" s1 = 0;\n" " s1 = 0;\n"
" s1 = '\\0';\n"
" std::string s2 = 0;\n" " std::string s2 = 0;\n"
" std::string s2 = '\\0';\n"
" std::string s3(0);\n" " std::string s3(0);\n"
" foo(std::string(0));\n" " foo(std::string(0));\n"
" s1 = p;\n" " s1 = p;\n"
@ -2019,15 +2024,13 @@ private:
" std::string s5(p);\n" " std::string s5(p);\n"
" foo(std::string(p));\n" " foo(std::string(p));\n"
"}", true); "}", true);
ASSERT_EQUALS("[test.cpp:7]: (error) Possible null pointer dereference: p\n" ASSERT_EQUALS("[test.cpp:9]: (error) Possible null pointer dereference: p\n"
"[test.cpp:8]: (error) Possible null pointer dereference: p\n"
"[test.cpp:3]: (error) Null pointer dereference\n"
"[test.cpp:4]: (error) Null pointer dereference\n"
"[test.cpp:5]: (error) Null pointer dereference\n"
"[test.cpp:6]: (error) Null pointer dereference\n"
/* TODO: handle std::string
"[test.cpp:9]: (error) Possible null pointer dereference: p\n"
"[test.cpp:10]: (error) Possible null pointer dereference: p\n" "[test.cpp:10]: (error) Possible null pointer dereference: p\n"
"[test.cpp:7]: (error) Null pointer dereference\n"
"[test.cpp:8]: (error) Null pointer dereference\n"
/* TODO: handle std::string
"[test.cpp:11]: (error) Possible null pointer dereference: p\n"
"[test.cpp:12]: (error) Possible null pointer dereference: p\n"
*/ */
, errout.str()); , errout.str());