Try to address some Coverity issues. Add TODO testcase for cppcheck-opensource#5783. Introduce TODO_ASSERT macro.

amai2012 · amai2012 · commit 8b97f04de4a7 · 2015-07-19T15:03:35.000+02:00
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -595,21 +595,21 @@ static void PrintCallstack(FILE* f, PEXCEPTION_POINTERS ex)
 static void writeMemoryErrorDetails(FILE* f, PEXCEPTION_POINTERS ex, const char* description)
 {
     fputs(description, f);
-    fprintf(f, " (instruction: 0x%p) ", ex->ExceptionRecord->ExceptionAddress);
+    fprintf(f, " (instruction: 0x%X) ", ex->ExceptionRecord->ExceptionAddress);
     // Using %p for ULONG_PTR later on, so it must have size identical to size of pointer
     // This is not the universally portable solution but good enough for Win32/64
     C_ASSERT(sizeof(void*) == sizeof(ex->ExceptionRecord->ExceptionInformation[1]));
     switch (ex->ExceptionRecord->ExceptionInformation[0]) {
     case 0:
-        fprintf(f, "reading from 0x%p",
+        fprintf(f, "reading from 0x%X",
                 ex->ExceptionRecord->ExceptionInformation[1]);
         break;
     case 1:
-        fprintf(f, "writing to 0x%p",
+        fprintf(f, "writing to 0x%X",
                 ex->ExceptionRecord->ExceptionInformation[1]);
         break;
     case 8:
-        fprintf(f, "data execution prevention at 0x%p",
+        fprintf(f, "data execution prevention at 0x%X",
                 ex->ExceptionRecord->ExceptionInformation[1]);
         break;
     default:
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -1730,7 +1730,7 @@ bool Tokenizer::tokenize(std::istream &code,
     _configuration = configuration;
 
     if (!list.createTokens(code, Path::getRelativePath(Path::simplifyPath(FileName), _settings->_basePaths))) {
-        cppcheckError(0);
+        cppcheckError(nullptr);
         return false;
     }
 
@@ -1768,7 +1768,7 @@ bool Tokenizer::tokenizeCondition(const std::string &code)
     {
         std::istringstream istr(code);
         if (!list.createTokens(istr)) {
-            cppcheckError(0);
+            cppcheckError(nullptr);
             return false;
         }
     }
@@ -8773,9 +8773,10 @@ void Tokenizer::simplifyComma()
                     break;
                 }
             }
-
+            if (!startFrom)
+                // to be very sure...
+                return;
             std::size_t commaCounter = 0;
-
             for (Token *tok2 = startFrom->next(); tok2; tok2 = tok2->next()) {
                 if (tok2->str() == ";") {
                     endAt = tok2;
diff --git a/test/testsuite.h b/test/testsuite.h
@@ -90,6 +90,7 @@ extern std::ostringstream warnings;
 #define ASSERT_EQUALS_DOUBLE( EXPECTED , ACTUAL )  assertEqualsDouble(__FILE__, __LINE__, EXPECTED, ACTUAL)
 #define ASSERT_EQUALS_MSG( EXPECTED , ACTUAL, MSG )  assertEquals(__FILE__, __LINE__, EXPECTED, ACTUAL, MSG)
 #define ASSERT_THROW( CMD, EXCEPTION ) try { CMD ; assertThrowFail(__FILE__, __LINE__); } catch (const EXCEPTION&) { } catch (...) { assertThrowFail(__FILE__, __LINE__); }
+#define TODO_ASSERT( CONDITION ) { bool condition=CONDITION; todoAssertEquals(__FILE__, __LINE__, true, false, condition); }
 #define TODO_ASSERT_EQUALS( WANTED , CURRENT , ACTUAL ) todoAssertEquals(__FILE__, __LINE__, WANTED, CURRENT, ACTUAL)
 #define REGISTER_TEST( CLASSNAME ) namespace { CLASSNAME instance; }
 
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -474,6 +474,7 @@ class TestTokenizer : public TestFixture {
 
         TEST_CASE(sizeofAddParentheses);
         TEST_CASE(incompleteTernary); // #6659
+        TEST_CASE(noreturn); // #5783
     }
 
     std::string tokenizeAndStringify(const char code[], bool simplify = false, bool expand = true, Settings::PlatformType platform = Settings::Unspecified, const char* filename = "test.cpp", bool cpp11 = true) {
@@ -8772,6 +8773,31 @@ class TestTokenizer : public TestFixture {
 
         tokenizeAndStringify(code, true);
     }
+
+    // see #5783
+    void noreturn() {
+        const char code[] = "void myassert() {\n"
+                            "  exit(1);\n"
+                            "}\n"
+                            "void f(char *buf) {\n"
+                            "  if(i==0) {\n"
+                            "    free(buf);\n"
+                            "    myassert();\n"
+                            "  }\n"
+                            "  free(buf);\n"
+                            "}\n";
+        Settings settings;
+
+        // tokenize..
+        Tokenizer tokenizer(&settings, this);
+        std::istringstream istr(code);
+        tokenizer.tokenize(istr, "test.cpp");
+
+        const Token * func = Token::findsimplematch(tokenizer.tokens(), "myassert");
+
+        TODO_ASSERT(func && func->isAttributeNoreturn());
+
+    }
 };
 
 REGISTER_TEST(TestTokenizer)

Original file line number	Diff line number	Diff line change
`@@ -1730,7 +1730,7 @@ bool Tokenizer::tokenize(std::istream &code,`
`1730`	`1730`	`_configuration = configuration;`
`1731`	`1731`
`1732`	`1732`	`if (!list.createTokens(code, Path::getRelativePath(Path::simplifyPath(FileName), _settings->_basePaths))) {`
`1733`		`- cppcheckError(0);`
	`1733`	`+ cppcheckError(nullptr);`
`1734`	`1734`	`return false;`
`1735`	`1735`	`}`
`1736`	`1736`
`@@ -1768,7 +1768,7 @@ bool Tokenizer::tokenizeCondition(const std::string &code)`
`1768`	`1768`	`{`
`1769`	`1769`	`std::istringstream istr(code);`
`1770`	`1770`	`if (!list.createTokens(istr)) {`
`1771`		`- cppcheckError(0);`
	`1771`	`+ cppcheckError(nullptr);`
`1772`	`1772`	`return false;`
`1773`	`1773`	`}`
`1774`	`1774`	`}`
`@@ -8773,9 +8773,10 @@ void Tokenizer::simplifyComma()`
`8773`	`8773`	`break;`
`8774`	`8774`	`}`
`8775`	`8775`	`}`
`8776`		`-`
	`8776`	`+ if (!startFrom)`
	`8777`	`+ // to be very sure...`
	`8778`	`+ return;`
`8777`	`8779`	`std::size_t commaCounter = 0;`
`8778`		`-`
`8779`	`8780`	`for (Token *tok2 = startFrom->next(); tok2; tok2 = tok2->next()) {`
`8780`	`8781`	`if (tok2->str() == ";") {`
`8781`	`8782`	`endAt = tok2;`