Fix handling of sizeof &var (danmar#1498)

b4n · danmar · commit cad4e4ab20ec · 2018-11-30T13:53:58.000+01:00
Fixes https://trac.cppcheck.net/ticket/8870
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -3340,7 +3340,7 @@ void Tokenizer::sizeofAddParentheses()
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (!Token::Match(tok, "sizeof !!("))
             continue;
-        if (tok->next()->isLiteral() || Token::Match(tok->next(), "%name%|*|~|!")) {
+        if (tok->next()->isLiteral() || Token::Match(tok->next(), "%name%|*|~|!|&")) {
             Token *endToken = tok->next();
             while (Token::simpleMatch(endToken, "* *"))
                 endToken = endToken->next();
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -8662,6 +8662,7 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("sizeof ( a . b ) + 3 ;", tokenizeAndStringify("sizeof a.b+3;"));
         ASSERT_EQUALS("sizeof ( a [ 2 ] . b ) + 3 ;", tokenizeAndStringify("sizeof a[2].b+3;"));
         ASSERT_EQUALS("f ( 0 , sizeof ( ptr . bar ) ) ;", tokenizeAndStringify("f(0, sizeof ptr->bar );"));
+        ASSERT_EQUALS("sizeof ( a ) > sizeof ( & main ) ;", tokenizeAndStringify("sizeof a > sizeof &main;"));
     }
 
     void findGarbageCode() { // Make sure the Tokenizer::findGarbageCode() does not have FPs

Original file line number	Diff line number	Diff line change
`@@ -8662,6 +8662,7 @@ class TestTokenizer : public TestFixture {`
`8662`	`8662`	`ASSERT_EQUALS("sizeof ( a . b ) + 3 ;", tokenizeAndStringify("sizeof a.b+3;"));`
`8663`	`8663`	`ASSERT_EQUALS("sizeof ( a [ 2 ] . b ) + 3 ;", tokenizeAndStringify("sizeof a[2].b+3;"));`
`8664`	`8664`	`ASSERT_EQUALS("f ( 0 , sizeof ( ptr . bar ) ) ;", tokenizeAndStringify("f(0, sizeof ptr->bar );"));`
	`8665`	`+ ASSERT_EQUALS("sizeof ( a ) > sizeof ( & main ) ;", tokenizeAndStringify("sizeof a > sizeof &main;"));`
`8665`	`8666`	`}`
`8666`	`8667`
`8667`	`8668`	`void findGarbageCode() { // Make sure the Tokenizer::findGarbageCode() does not have FPs`