Fixed #1094 (Improve check: unusual pointer arithmetic: 'ch+str')

This commit is contained in:
Monika Lukow 2010-02-07 21:44:11 +01:00
parent cd5b95849d
commit 2d5d060514
2 changed files with 14 additions and 5 deletions

View File

@ -820,7 +820,7 @@ void CheckOther::strPlusChar()
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
{
// Declaring char variable..
if (Token::Match(tok, "char %var% [;=]"))
if (Token::Match(tok, "char|int|short %var% [;=]"))
{
unsigned int varid = tok->next()->varId();
if (varid > 0 && varid < 10000)

View File

@ -431,10 +431,19 @@ private:
// Strange looking pointer arithmetic..
strPlusChar("void foo()\n"
"{\n"
" char ch = '/';\n"
" const char *p = \"/usr\" + ch;\n"
" char ch = 1;\n"
" const char *p = ch + \"/usr\";\n"
"}\n");
ASSERT_EQUALS("[test.cpp:4]: (error) Unusual pointer arithmetic\n", errout.str());
ASSERT_EQUALS("", errout.str());
// Strange looking pointer arithmetic..
strPlusChar("void foo()\n"
"{\n"
" int i = 1;\n"
" const char* psz = \"Bla\";\n"
" const std::string str = i + psz;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}
void strPlusChar3()