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

Fixed #5972 (FP: Buffer is accessed out of bounds)

This commit is contained in:
Daniel Marjamäki 2014-07-08 16:31:08 +02:00
parent 254b6438b9
commit 14def42c99
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/tokenize.cpp
View File

@ -6738,10 +6738,14 @@ bool Tokenizer::simplifyKnownVariablesSimplify(Token **tok2, Token *tok3, unsign
// Variable is used in function call..
if (Token::Match(tok3, ("%var% ( " + structname + " %varid% ,").c_str(), varid)) {
static const char * const functionName[] = {
"memcmp","memcpy","memmove","memset",
"strcmp","strcpy","strncmp","strncpy","strdup"
// always simplify
"strcmp", "strdup",
// don't simplify buffer value
"memcmp","memcpy","memmove","memset","strcpy","strncmp","strncpy"
};
for (unsigned int i = 0; i < (sizeof(functionName) / sizeof(*functionName)); ++i) {
if (valueVarId == 0U && i >= 2)
break;
if (tok3->str() == functionName[i]) {
Token *par1 = tok3->tokAt(2);
if (!structname.empty()) {
@ -6758,10 +6762,14 @@ bool Tokenizer::simplifyKnownVariablesSimplify(Token **tok2, Token *tok3, unsign
// Variable is used as 2nd parameter in function call..
if (Token::Match(tok3, ("%var% ( %any% , " + structname + " %varid% ,|)").c_str(), varid)) {
static const char * const functionName[] = {
"memcmp","memcpy","memmove",
// always simplify
"strcmp","strcpy","strncmp","strncpy"
// don't simplify buffer value
"memcmp","memcpy","memmove"
};
for (unsigned int i = 0; i < (sizeof(functionName) / sizeof(*functionName)); ++i) {
if (valueVarId == 0U && i >= 4)
break;
if (tok3->str() == functionName[i]) {
Token *par = tok3->tokAt(4);
if (!structname.empty()) {

8
test/testtokenize.cpp
View File

@ -2615,6 +2615,14 @@ private:
"}";
const char expected[] = "void f ( ) { const char * q ; q = \"hello\" ; strcpy ( p , \"hello\" ) ; }";
ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
// Ticket #5972
const char code2[] = "void f() {"
" char buf[10] = \"ab\";"
" memset(buf, 0, 10);"
"}";
const char expected2[] = "void f ( ) { char buf [ 10 ] = \"ab\" ; memset ( buf , 0 , 10 ) ; }";
ASSERT_EQUALS(expected2, tokenizeAndStringify(code2, true));
}
void simplifyKnownVariables37() {