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

Library: return true from Library::isnullargbad() for format string arguments. Related with #7012.

This commit is contained in:
Daniel Marjamäki 2015-10-03 20:51:45 +02:00
parent 61cdd01ce3
commit f5bd00f153
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/library.cpp
View File

@ -683,6 +683,19 @@ static std::string functionName(const Token *ftok)
return ret;
}
bool Library::isnullargbad(const Token *ftok, int argnr) const
{
const ArgumentChecks *arg = getarg(ftok, argnr);
if (!arg) {
// scan format string argument should not be null
const std::string funcname = functionName(ftok);
std::map<std::string, std::pair<bool, bool> >::const_iterator it = _formatstr.find(funcname);
if (it != _formatstr.end() && it->second.first)
return true;
}
return arg && arg->notnull;
}
bool Library::isuninitargbad(const Token *ftok, int argnr) const
{
const ArgumentChecks *arg = getarg(ftok, argnr);

6
lib/library.h
View File

@ -212,11 +212,7 @@ public:
return arg && arg->notbool;
}
bool isnullargbad(const Token *ftok, int argnr) const {
const ArgumentChecks *arg = getarg(ftok, argnr);
return arg && arg->notnull;
}
bool isnullargbad(const Token *ftok, int argnr) const;
bool isuninitargbad(const Token *ftok, int argnr) const;
bool isargformatstr(const Token *ftok, int argnr) const {

4
test/cfg/std.c
View File

@ -165,6 +165,10 @@ void nullpointer(int value)
snprintf(NULL, 0, "someformatstring"); // legal
// cppcheck-suppress nullPointer
snprintf(NULL, 42, "someformatstring"); // not legal
scanf("%i", &res);
// cppcheck-suppress nullPointer
scanf("%i", NULL);
}
void nullpointerMemchr1(char *p, char *s)