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

Fix #12019 (False positive: null pointer, array zero initialization) (#5495)

This commit is contained in:
Daniel Marjamäki 2023-09-28 15:18:08 +02:00 committed by GitHub
parent c4fe5ac8b7
commit ed5532c2a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/tokenize.cpp
View File

@ -888,10 +888,16 @@ namespace {
if (!after) if (!after)
throw InternalError(tok, "Failed to simplify typedef. Is the code valid?"); throw InternalError(tok, "Failed to simplify typedef. Is the code valid?");
const Token* const tok4 = useAfterVarRange ? insertTokens(after->previous(), mRangeAfterVar)->next() : tok3->next(); Token* const tok4 = useAfterVarRange ? insertTokens(after->previous(), mRangeAfterVar)->next() : tok3->next();
tok->deleteThis(); tok->deleteThis();
// Unsplit variable declarations
if (Token::Match(tok4->previous(), "] ; %name% = {") && tok4->isSplittedVarDeclEq()) {
tok4->deleteNext();
tok4->deleteThis();
}
// Set links // Set links
std::stack<Token*> brackets; std::stack<Token*> brackets;
for (; tok != tok4; tok = tok->next()) { for (; tok != tok4; tok = tok->next()) {

10
test/testsimplifytypedef.cpp
View File

@ -67,6 +67,7 @@ private:
TEST_CASE(carray1); TEST_CASE(carray1);
TEST_CASE(carray2); TEST_CASE(carray2);
TEST_CASE(carray3); TEST_CASE(carray3);
TEST_CASE(carray4);
TEST_CASE(cdonotreplace1); TEST_CASE(cdonotreplace1);
TEST_CASE(cppfp1); TEST_CASE(cppfp1);
TEST_CASE(Generic1); TEST_CASE(Generic1);
@ -472,6 +473,13 @@ private:
ASSERT_EQUALS("int ( * p ) [ 3 ] [ 2 ] [ 1 ] ;", simplifyTypedef(code)); ASSERT_EQUALS("int ( * p ) [ 3 ] [ 2 ] [ 1 ] ;", simplifyTypedef(code));
} }
void carray4() {
const char* code{};
code = "typedef int arr[12];\n" // #12019
"void foo() { arr temp = {0}; }\n";
ASSERT_EQUALS("void foo ( ) { int temp [ 12 ] = { 0 } ; }", tok(code));
}
void cdonotreplace1() { void cdonotreplace1() {
const char code[] = "typedef int t;\n" const char code[] = "typedef int t;\n"
"int* t;"; "int* t;";
@ -1869,7 +1877,7 @@ private:
"}"; "}";
// The expected tokens.. // The expected tokens..
const char expected2[] = "void f ( ) { char a [ 256 ] ; a = { 0 } ; char b [ 256 ] ; b = { 0 } ; }"; const char expected2[] = "void f ( ) { char a [ 256 ] = { 0 } ; char b [ 256 ] = { 0 } ; }";
ASSERT_EQUALS(expected2, tok(code2, false, cppcheck::Platform::Type::Native, false)); ASSERT_EQUALS(expected2, tok(code2, false, cppcheck::Platform::Type::Native, false));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());