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

Fixed crashes #3830 and #3832

This commit is contained in:
PKEuS 2012-05-23 01:04:21 -07:00
parent dc64ac2918
commit 9ca7f6a8c3
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checkio.cpp
View File

@ -128,21 +128,21 @@ void CheckIO::checkFileUsage()
i->second.lastOperation = Filepointer::UNKNOWN_OP; i->second.lastOperation = Filepointer::UNKNOWN_OP;
} }
} }
} else if (tok->varId() && Token::Match(tok, "%var% =") && (tok->strAt(2) != "fopen" && tok->strAt(2) != "tmpfile")) { } else if (tok->varId() && Token::Match(tok, "%var% =") && (tok->strAt(2) != "fopen" && tok->strAt(2) != "freopen" && tok->strAt(2) != "tmpfile")) {
std::map<unsigned int, Filepointer>::iterator i = filepointers.find(tok->varId()); std::map<unsigned int, Filepointer>::iterator i = filepointers.find(tok->varId());
if (i != filepointers.end()) { if (i != filepointers.end()) {
i->second.mode = UNKNOWN; i->second.mode = UNKNOWN;
i->second.lastOperation = Filepointer::UNKNOWN_OP; i->second.lastOperation = Filepointer::UNKNOWN_OP;
} }
} else if (Token::Match(tok, "%var% (")) { } else if (Token::Match(tok, "%var% (") && tok->previous() && (!tok->previous()->isName() || Token::Match(tok->previous(), "return|throw"))) {
std::string mode; std::string mode;
const Token* fileTok = 0; const Token* fileTok = 0;
Filepointer::Operation operation = Filepointer::NONE; Filepointer::Operation operation = Filepointer::NONE;
if (tok->str() == "fopen" || tok->str() == "freopen" || tok->str() == "tmpfile") { if ((tok->str() == "fopen" || tok->str() == "freopen" || tok->str() == "tmpfile") && tok->strAt(-1) == "=") {
if (tok->str() != "tmpfile") { if (tok->str() != "tmpfile") {
const Token* modeTok = tok->tokAt(2)->nextArgument(); const Token* modeTok = tok->tokAt(2)->nextArgument();
if (modeTok) if (modeTok && modeTok->type() == Token::eString)
mode = modeTok->strValue(); mode = modeTok->strValue();
} else } else
mode = "wb+"; mode = "wb+";

7
test/testio.cpp
View File

@ -193,13 +193,14 @@ private:
"}"); "}");
ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was only opened for reading.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was only opened for reading.\n", errout.str());
// Crash tests
check("void foo(FILE*& f) {\n" check("void foo(FILE*& f) {\n"
" f = tmpfile();\n" // tmpfile opens as wb+ " f = fopen(name, mode);\n" // No assertion failure (#3830)
" fwrite(buffer, 5, 6, f);\n" " fwrite(buffer, 5, 6, f);\n"
" rewind(f);\n"
" fread(buffer, 5, 6, f);\n"
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("void fopen(std::string const &filepath, std::string const &mode);"); // #3832
} }
void wrongMode_complex() { void wrongMode_complex() {