Fixed cppcheck-opensource#5134 (Memory leak below CheckIO::checkWrongPrintfScanfArguments())

IOBYTE · danmar · commit ac3b1c061172 · 2013-11-01T05:42:37.000+01:00
diff --git a/lib/checkio.cpp b/lib/checkio.cpp
@@ -1421,6 +1421,16 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * tok, const Settings *settings)
     }
 }
 
+CheckIO::ArgumentInfo::~ArgumentInfo()
+{
+    if (tempToken) {
+        while (tempToken->next())
+            tempToken->deleteNext();
+
+        delete tempToken;
+    }
+}
+
 bool CheckIO::ArgumentInfo::isStdVectorOrString()
 {
     if (Token::Match(variableInfo->typeStartToken(), "std :: vector|array <")) {
diff --git a/lib/checkio.h b/lib/checkio.h
@@ -72,9 +72,8 @@ class CPPCHECKLIB CheckIO : public Check {
     class ArgumentInfo {
     public:
         ArgumentInfo(const Token *arg, const Settings *settings);
-        ~ArgumentInfo() {
-            delete tempToken;
-        }
+        ~ArgumentInfo();
+
         bool isArrayOrPointer() const;
         bool isComplexType() const;
         bool isKnownType() const;

Original file line number	Diff line number	Diff line change
`@@ -1421,6 +1421,16 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * tok, const Settings *settings)`
`1421`	`1421`	`}`
`1422`	`1422`	`}`
`1423`	`1423`
	`1424`	`+CheckIO::ArgumentInfo::~ArgumentInfo()`
	`1425`	`+{`
	`1426`	`+ if (tempToken) {`
	`1427`	`+ while (tempToken->next())`
	`1428`	`+ tempToken->deleteNext();`
	`1429`	`+`
	`1430`	`+ delete tempToken;`
	`1431`	`+ }`
	`1432`	`+}`
	`1433`	`+`
`1424`	`1434`	`bool CheckIO::ArgumentInfo::isStdVectorOrString()`
`1425`	`1435`	`{`
`1426`	`1436`	`if (Token::Match(variableInfo->typeStartToken(), "std :: vector\|array <")) {`