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

#6784 segmentation fault (invalid code) in Tokenizer::simplifyTypedef. Avoid null pointer access

This commit is contained in:
Alexander Mai 2015-06-22 20:43:26 +02:00
parent 99524b1f59
commit 07bcc7157b
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tokenize.cpp
View File

@ -1396,6 +1396,10 @@ void Tokenizer::simplifyTypedef()
// skip over variable name if there // skip over variable name if there
if (!inCast) { if (!inCast) {
if (!tok2 || !tok2->next()) {
syntaxError(nullptr);
return;
}
if (tok2->next()->str() != ")") if (tok2->next()->str() != ")")
tok2 = tok2->next(); tok2 = tok2->next();
} }

6
test/testgarbage.cpp
View File

@ -1,3 +1,4 @@
/* /*
* Cppcheck - A tool for static C/C++ code analysis * Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2015 Daniel Marjamäki and Cppcheck team. * Copyright (C) 2007-2015 Daniel Marjamäki and Cppcheck team.
@ -123,6 +124,7 @@ private:
TEST_CASE(garbageCode82); TEST_CASE(garbageCode82);
TEST_CASE(garbageCode83); TEST_CASE(garbageCode83);
TEST_CASE(garbageCode84); TEST_CASE(garbageCode84);
TEST_CASE(garbageCode85);
TEST_CASE(garbageValueFlow); TEST_CASE(garbageValueFlow);
TEST_CASE(garbageSymbolDatabase); TEST_CASE(garbageSymbolDatabase);
@ -681,6 +683,10 @@ private:
checkCode("int main ( [ ] ) { " " [ ] ; int i = 0 ; do { } ; } ( [ ] ) { }"); // do not crash checkCode("int main ( [ ] ) { " " [ ] ; int i = 0 ; do { } ; } ( [ ] ) { }"); // do not crash
} }
void garbageCode85() { // #6784
ASSERT_THROW(checkCode("{ } { } typedef void ( *VoidFunc() ) ( ) ; VoidFunc"), InternalError); // do not crash
}
void garbageValueFlow() { void garbageValueFlow() {
// #6089 // #6089
const char* code = "{} int foo(struct, x1, struct x2, x3, int, x5, x6, x7)\n" const char* code = "{} int foo(struct, x1, struct x2, x3, int, x5, x6, x7)\n"