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

Better fix for #4706: Use Token::nextArgument() properly. Removed redundant ' in message

This commit is contained in:
PKEuS 2013-04-09 08:30:53 -07:00
parent 4c8b17c040
commit c487ea843d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/checkbufferoverrun.cpp
View File

@ -2248,14 +2248,14 @@ void CheckBufferOverrun::writeOutsideBufferSize()
for (std::size_t i = 0; i < functions; ++i) { for (std::size_t i = 0; i < functions; ++i) {
const Scope * scope = symbolDatabase->functionScopes[i]; const Scope * scope = symbolDatabase->functionScopes[i];
for (const Token *tok = scope->classStart; tok && tok != scope->classEnd; tok = tok->next()) { for (const Token *tok = scope->classStart; tok && tok != scope->classEnd; tok = tok->next()) {
if (Token::Match(tok, "pwrite|write (") && Token::Match(tok->tokAt(2), "%any% , %str% , %num%")) { if (Token::Match(tok, "pwrite|write (") && Token::Match(tok->tokAt(2)->nextArgument(), "%str% , %num%")) {
const std::string & functionName(tok->str()); const std::string & functionName(tok->str());
tok = tok->tokAt(4); // set tokenptr to %str% parameter tok = tok->tokAt(2)->nextArgument(); // set tokenptr to %str% parameter
const std::size_t stringLength = Token::getStrLength(tok); const std::size_t stringLength = Token::getStrLength(tok);
tok = tok->tokAt(2); // set tokenptr to %num% parameter tok = tok->tokAt(2); // set tokenptr to %num% parameter
const MathLib::bigint writeLength = MathLib::toLongNumber(tok->str()); const MathLib::bigint writeLength = MathLib::toLongNumber(tok->str());
if (static_cast<unsigned long int>(writeLength) > stringLength) if (static_cast<std::size_t>(writeLength) > stringLength)
writeOutsideBufferSizeError(tok, stringLength, writeLength,functionName); writeOutsideBufferSizeError(tok, stringLength, writeLength, functionName);
} }
} }
} }
@ -2264,8 +2264,8 @@ void CheckBufferOverrun::writeOutsideBufferSize()
void CheckBufferOverrun::writeOutsideBufferSizeError(const Token *tok, const std::size_t stringLength, const MathLib::bigint writeLength, const std::string &strFunctionName) void CheckBufferOverrun::writeOutsideBufferSizeError(const Token *tok, const std::size_t stringLength, const MathLib::bigint writeLength, const std::string &strFunctionName)
{ {
reportError(tok, Severity::error, "writeOutsideBufferSize", reportError(tok, Severity::error, "writeOutsideBufferSize",
"Writing '" +MathLib::longToString(writeLength-stringLength)+"' bytes outside buffer size.\n" "Writing " + MathLib::longToString(writeLength-stringLength) + " bytes outside buffer size.\n"
"The number of bytes to write ('" +MathLib::longToString(writeLength)+ "' bytes) are bigger than the source buffer ('" +MathLib::longToString(stringLength)+ "' bytes)." "The number of bytes to write (" + MathLib::longToString(writeLength) + " bytes) are bigger than the source buffer (" +MathLib::longToString(stringLength)+ " bytes)."
" Please check the second and the third parameter of the function '"+strFunctionName+"'."); " Please check the second and the third parameter of the function '"+strFunctionName+"'.");
} }
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------

4
test/testbufferoverrun.cpp
View File

@ -4098,7 +4098,7 @@ private:
check("void f(void){\n" check("void f(void){\n"
"write(1, \"Dump string \\n\", 100);\n" "write(1, \"Dump string \\n\", 100);\n"
"}"); // ^ number of bytes too big "}"); // ^ number of bytes too big
ASSERT_EQUALS("[test.cpp:2]: (error) Writing '87' bytes outside buffer size.\n", errout.str()); ASSERT_EQUALS("[test.cpp:2]: (error) Writing 87 bytes outside buffer size.\n", errout.str());
check("void f(void){\n" check("void f(void){\n"
"write(1, \"Dump string \\n\", 10);\n" "write(1, \"Dump string \\n\", 10);\n"
@ -4113,7 +4113,7 @@ private:
"{\n" "{\n"
" write(p.i[1], \"\", 1);\n" " write(p.i[1], \"\", 1);\n"
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("[test.cpp:6]: (error) Writing 1 bytes outside buffer size.\n", errout.str());
} }
}; };