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

CheckIO: fixed handling of unknown types. Ticket #5051

This commit is contained in:
Robert Reif 2013-10-05 16:47:06 +02:00 committed by Daniel Marjamäki
parent 6830d5f7a4
commit 7098fc6039
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/checkio.cpp
View File

@ -1024,7 +1024,7 @@ void CheckIO::checkWrongPrintfScanfArguments()
break; break;
} }
} }
} else if (argInfo.isArrayOrPointer()) { } else if (argInfo.isArrayOrPointer() && !argInfo.element) {
// use %p on pointers and arrays // use %p on pointers and arrays
invalidPrintfArgTypeError_int(tok, numFormat, specifier, &argInfo); invalidPrintfArgTypeError_int(tok, numFormat, specifier, &argInfo);
} }
@ -1083,7 +1083,7 @@ void CheckIO::checkWrongPrintfScanfArguments()
break; break;
} }
} }
} else if (argInfo.isArrayOrPointer()) { } else if (argInfo.isArrayOrPointer() && !argInfo.element) {
// use %p on pointers and arrays // use %p on pointers and arrays
invalidPrintfArgTypeError_sint(tok, numFormat, specifier, &argInfo); invalidPrintfArgTypeError_sint(tok, numFormat, specifier, &argInfo);
} }
@ -1141,7 +1141,7 @@ void CheckIO::checkWrongPrintfScanfArguments()
break; break;
} }
} }
} else if (argInfo.isArrayOrPointer()) { } else if (argInfo.isArrayOrPointer() && !argInfo.element) {
invalidPrintfArgTypeError_uint(tok, numFormat, specifier, &argInfo); invalidPrintfArgTypeError_uint(tok, numFormat, specifier, &argInfo);
} }
done = true; done = true;
@ -1171,7 +1171,7 @@ void CheckIO::checkWrongPrintfScanfArguments()
(specifier[0] != 'L' && argInfo.typeToken->isLong())) (specifier[0] != 'L' && argInfo.typeToken->isLong()))
invalidPrintfArgTypeError_float(tok, numFormat, specifier, &argInfo); invalidPrintfArgTypeError_float(tok, numFormat, specifier, &argInfo);
} else if (argInfo.isArrayOrPointer()) { } else if (argInfo.isArrayOrPointer() && !argInfo.element) {
// use %p on pointers and arrays // use %p on pointers and arrays
invalidPrintfArgTypeError_float(tok, numFormat, specifier, &argInfo); invalidPrintfArgTypeError_float(tok, numFormat, specifier, &argInfo);
} }
@ -1717,7 +1717,7 @@ void CheckIO::argumentType(std::ostream& os, const ArgumentInfo * argInfo)
type = type->next(); type = type->next();
} }
type->stringify(os, false, true); type->stringify(os, false, true);
if (type->strAt(1) == "*" && !(argInfo->functionInfo && argInfo->element)) if (type->strAt(1) == "*" && !argInfo->element)
os << " *"; os << " *";
else if (argInfo->variableInfo && !argInfo->element && argInfo->variableInfo->isArray()) else if (argInfo->variableInfo && !argInfo->element && argInfo->variableInfo->isArray())
os << " *"; os << " *";

15
test/testio.cpp
View File

@ -2044,6 +2044,21 @@ private:
ASSERT_EQUALS("[test.cpp:2]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'int'.\n" ASSERT_EQUALS("[test.cpp:2]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'int'.\n"
"[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'const void *'.\n", errout.str()); "[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'const void *'.\n", errout.str());
check("void foo() {\n"
" UNKNOWN * u;\n"
" printf(\"%d %x %u %f\", u[i], u[i], u[i], u[i]);\n"
"}\n");
ASSERT_EQUALS("", errout.str());
check("void foo() {\n"
" long * l;\n"
" printf(\"%d %x %u %f\", l[i], l[i], l[i], l[i]);\n"
"}\n");
ASSERT_EQUALS("[test.cpp:3]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'long'.\n"
"[test.cpp:3]: (warning) %x in format string (no. 2) requires 'unsigned int' but the argument type is 'long'.\n"
"[test.cpp:3]: (warning) %u in format string (no. 3) requires 'unsigned int' but the argument type is 'long'.\n"
"[test.cpp:3]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'long'.\n", errout.str());
} }
void testPosixPrintfScanfParameterPosition() { // #4900 - No support for parameters in format strings void testPosixPrintfScanfParameterPosition() { // #4900 - No support for parameters in format strings