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

Fixed #5248 (False positive: Invalid argument in scanf for %zd)

This commit is contained in:
Robert Reif 2014-01-14 06:09:13 +01:00 committed by Daniel Marjamäki
parent c1c2f4bbc6
commit d679a4c1f7
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checkio.cpp
View File

@ -787,7 +787,8 @@ void CheckIO::checkWrongPrintfScanfArguments()
invalidScanfArgTypeError_int(tok, numFormat, specifier, &argInfo, false); invalidScanfArgTypeError_int(tok, numFormat, specifier, &argInfo, false);
break; break;
case 'z': case 'z':
if (argInfo.typeToken->originalName() != "size_t") if (argInfo.typeToken->originalName() != "ptrdiff_t" &&
argInfo.typeToken->originalName() != "ssize_t")
invalidScanfArgTypeError_int(tok, numFormat, specifier, &argInfo, false); invalidScanfArgTypeError_int(tok, numFormat, specifier, &argInfo, false);
break; break;
case 't': case 't':
@ -1625,7 +1626,10 @@ void CheckIO::invalidScanfArgTypeError_int(const Token* tok, unsigned int numFor
else else
errmsg << "intmax_t"; errmsg << "intmax_t";
} else if (specifier[0] == 'z') { } else if (specifier[0] == 'z') {
errmsg << "size_t"; if (specifier[1] == 'd')
errmsg << "ptrdiff_t";
else
errmsg << "size_t";
} else if (specifier[0] == 't') { } else if (specifier[0] == 't') {
errmsg << (isUnsigned ? "unsigned " : "") << "ptrdiff_t"; errmsg << (isUnsigned ? "unsigned " : "") << "ptrdiff_t";
} else if (specifier[0] == 'L') { } else if (specifier[0] == 'L') {

10
test/testio.cpp
View File

@ -1323,6 +1323,16 @@ private:
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("void g() {\n" // #5348
" size_t s1;\n"
" ptrdiff_t s2;\n"
" ssize_t s3;\n"
" scanf(\"%zd\", &s1);\n"
" scanf(\"%zd\", &s2);\n"
" scanf(\"%zd\", &s3);\n"
"}\n");
ASSERT_EQUALS("[test.cpp:5]: (warning) %zd in format string (no. 1) requires 'ptrdiff_t *' but the argument type is 'size_t * {aka unsigned long *}'.\n", errout.str());
} }
void testPrintfArgument() { void testPrintfArgument() {