checkio: Add missing id "invalidScanfFormatWidth_smaller" to errorlist output (danmar#1533)

versat · amai2012 · commit a1a695dcdaf2 · 2018-12-20T21:14:02.000+01:00
diff --git a/lib/checkio.cpp b/lib/checkio.cpp
@@ -1982,7 +1982,7 @@ void CheckIO::invalidScanfFormatWidthError(const Token* tok, unsigned int numFor
 
     std::ostringstream errmsg;
     if (arrlen > width) {
-        if (!mSettings->inconclusive || !mSettings->isEnabled(Settings::WARNING))
+        if (tok != nullptr && (!mSettings->inconclusive || !mSettings->isEnabled(Settings::WARNING)))
             return;
         errmsg << "Width " << width << " given in format string (no. " << numFormat << ") is smaller than destination buffer"
                << " '" << varname << "[" << arrlen << "]'.";
diff --git a/lib/checkio.h b/lib/checkio.h
@@ -162,6 +162,7 @@ class CPPCHECKLIB CheckIO : public Check {
         c.invalidPrintfArgTypeError_float(nullptr,  1, "f", nullptr);
         c.invalidLengthModifierError(nullptr,  1, "I");
         c.invalidScanfFormatWidthError(nullptr,  10, 5, nullptr, 's');
+        c.invalidScanfFormatWidthError(nullptr,  99, -1, nullptr, 's');
         c.wrongPrintfScanfPosixParameterPositionError(nullptr,  "printf", 2, 1);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,7 @@ class CPPCHECKLIB CheckIO : public Check {`
`162`	`162`	`c.invalidPrintfArgTypeError_float(nullptr, 1, "f", nullptr);`
`163`	`163`	`c.invalidLengthModifierError(nullptr, 1, "I");`
`164`	`164`	`c.invalidScanfFormatWidthError(nullptr, 10, 5, nullptr, 's');`
	`165`	`+ c.invalidScanfFormatWidthError(nullptr, 99, -1, nullptr, 's');`
`165`	`166`	`c.wrongPrintfScanfPosixParameterPositionError(nullptr, "printf", 2, 1);`
`166`	`167`	`}`
`167`	`168`