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

Fixed #8644 (crash (CheckBufferOverrun::checkGlobalAndLocalVariable): local function)

This commit is contained in:
Daniel Marjamäki 2018-08-30 10:01:19 +02:00
parent c1f436f7c0
commit 27aae8d032
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkbufferoverrun.cpp
View File

@ -1265,6 +1265,10 @@ void CheckBufferOverrun::checkGlobalAndLocalVariable()
// varid : The variable id for the array // varid : The variable id for the array
const Variable *var = tok->next()->variable(); const Variable *var = tok->next()->variable();
// FIXME: This is an ugly fix for a crash. The SymbolDatabase
// should create the variable.
if (!var)
continue;
if (mTokenizer->isCPP() && Token::Match(tok, "[*;{}] %var% = new %type% [")) { if (mTokenizer->isCPP() && Token::Match(tok, "[*;{}] %var% = new %type% [")) {
tok = tok->tokAt(5); tok = tok->tokAt(5);

9
test/testbufferoverrun.cpp
View File

@ -225,6 +225,7 @@ private:
TEST_CASE(crash2); // Ticket #3034 - crash TEST_CASE(crash2); // Ticket #3034 - crash
TEST_CASE(crash3); // Ticket #5426 - crash TEST_CASE(crash3); // Ticket #5426 - crash
TEST_CASE(crash4); // Ticket #8679 - crash TEST_CASE(crash4); // Ticket #8679 - crash
TEST_CASE(crash5); // Ticket #8644 - crash
TEST_CASE(executionPaths1); TEST_CASE(executionPaths1);
TEST_CASE(executionPaths2); TEST_CASE(executionPaths2);
@ -3654,6 +3655,14 @@ private:
"}"); "}");
} }
void crash5() { // 8644 - token has varId() but variable() is null
check("int a() {\n"
" void b(char **dst) {\n"
" *dst = malloc(50);\n"
" }\n"
"}");
}
void executionPaths1() { void executionPaths1() {
check("void f(int a)\n" check("void f(int a)\n"
"{\n" "{\n"