Fixed cppcheck-opensource#2292 (segmentation fault with cppcheck 1.46 with --errorlist)

Daniel Marjamäki · Daniel Marjamäki · commit 521484146df6 · 2010-12-13T19:09:20.000+01:00
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
@@ -114,7 +114,7 @@ void CheckBufferOverrun::bufferOverrun(const Token *tok, const std::string &varn
 
 void CheckBufferOverrun::strncatUsage(const Token *tok)
 {
-    if (!_settings->_checkCodingStyle)
+    if (_settings && !_settings->_checkCodingStyle)
         return;
 
     reportError(tok, Severity::warning, "strncatUsage", "Dangerous usage of strncat. Tip: the 3rd parameter means maximum number of characters to append");
@@ -127,7 +127,7 @@ void CheckBufferOverrun::outOfBounds(const Token *tok, const std::string &what)
 
 void CheckBufferOverrun::sizeArgumentAsChar(const Token *tok)
 {
-    if (!_settings->_checkCodingStyle)
+    if (_settings && !_settings->_checkCodingStyle)
         return;
     reportError(tok, Severity::warning, "sizeArgumentAsChar", "The size argument is given as a char constant");
 }
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
@@ -188,6 +188,8 @@ class TestBufferOverrun : public TestFixture
         TEST_CASE(cmdLineArgs1);
 
         TEST_CASE(scope);   // handling different scopes
+        
+        TEST_CASE(getErrorMessages);
     }
 
 
@@ -2699,6 +2701,13 @@ class TestBufferOverrun : public TestFixture
               "}\n");
         ASSERT_EQUALS("", errout.str());
     }
+
+	void getErrorMessages()
+	{
+		// Ticket #2292: segmentation fault when using --errorlist
+		CheckBufferOverrun c;
+		c.getErrorMessages();
+	}
 };
 
 REGISTER_TEST(TestBufferOverrun)

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ void CheckBufferOverrun::bufferOverrun(const Token *tok, const std::string &varn`
`114`	`114`
`115`	`115`	`void CheckBufferOverrun::strncatUsage(const Token *tok)`
`116`	`116`	`{`
`117`		`- if (!_settings->_checkCodingStyle)`
	`117`	`+ if (_settings && !_settings->_checkCodingStyle)`
`118`	`118`	`return;`
`119`	`119`
`120`	`120`	`reportError(tok, Severity::warning, "strncatUsage", "Dangerous usage of strncat. Tip: the 3rd parameter means maximum number of characters to append");`
`@@ -127,7 +127,7 @@ void CheckBufferOverrun::outOfBounds(const Token *tok, const std::string &what)`
`127`	`127`
`128`	`128`	`void CheckBufferOverrun::sizeArgumentAsChar(const Token *tok)`
`129`	`129`	`{`
`130`		`- if (!_settings->_checkCodingStyle)`
	`130`	`+ if (_settings && !_settings->_checkCodingStyle)`
`131`	`131`	`return;`
`132`	`132`	`reportError(tok, Severity::warning, "sizeArgumentAsChar", "The size argument is given as a char constant");`
`133`	`133`	`}`