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

Fixed #9137 (Tokenizer: Wrong handling of volatile pointer)

This commit is contained in:
Daniel Marjamäki 2019-08-03 12:28:50 +02:00
parent c03df8e6b4
commit cdc602e1be
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenize.cpp
View File

@ -6713,7 +6713,7 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
else if (std::strchr(";,", tok2->str()[0])) { else if (std::strchr(";,", tok2->str()[0])) {
// "type var =" => "type var; var =" // "type var =" => "type var; var ="
const Token *varTok = type0->tokAt(typelen); const Token *varTok = type0->tokAt(typelen);
while (Token::Match(varTok, "*|&|const")) while (Token::Match(varTok, "*|&|const|volatile"))
varTok = varTok->next(); varTok = varTok->next();
if (!varTok) if (!varTok)
syntaxError(tok2); // invalid code syntaxError(tok2); // invalid code

4
test/testtokenize.cpp
View File

@ -3645,6 +3645,10 @@ private:
const char code4[] = "const void * const p = NULL;"; const char code4[] = "const void * const p = NULL;";
const char res4[] = "const void * const p ; p = NULL ;"; const char res4[] = "const void * const p ; p = NULL ;";
ASSERT_EQUALS(res4, tokenizeAndStringify(code4)); ASSERT_EQUALS(res4, tokenizeAndStringify(code4));
const char code5[] = "const void * volatile p = NULL;";
const char res5[] = "const void * volatile p ; p = NULL ;";
ASSERT_EQUALS(res5, tokenizeAndStringify(code5));;
} }
void vardecl5() { void vardecl5() {