Fixed #8597 (False positive - Array index is used before limits check.)

danmar · danmar · commit 9ffb657c1a87 · 2019-12-20T09:46:01.000+01:00
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
@@ -633,7 +633,7 @@ void CheckBufferOverrun::arrayIndexThenCheck()
                 // Iterate AST upwards
                 const Token* tok2 = tok;
                 const Token* tok3 = tok2;
-                while (tok2->astParent() && tok2->tokType() != Token::eLogicalOp) {
+                while (tok2->astParent() && tok2->tokType() != Token::eLogicalOp && tok2->str() != "?") {
                     tok3 = tok2;
                     tok2 = tok2->astParent();
                 }
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
@@ -4099,6 +4099,11 @@ class TestBufferOverrun : public TestFixture {
               "  sizeof(a)/sizeof(a[i]) && i < 10;\n"
               "}");
         ASSERT_EQUALS("", errout.str());
+
+        check("void f(int i) {\n" // ?:
+              "  if ((i < 10 ? buf[i] : 1) && (i < 5 ? buf[i] : 5)){}\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void bufferNotZeroTerminated() {

Original file line number	Diff line number	Diff line change
`@@ -633,7 +633,7 @@ void CheckBufferOverrun::arrayIndexThenCheck()`
`633`	`633`	`// Iterate AST upwards`
`634`	`634`	`const Token* tok2 = tok;`
`635`	`635`	`const Token* tok3 = tok2;`
`636`		`- while (tok2->astParent() && tok2->tokType() != Token::eLogicalOp) {`
	`636`	`+ while (tok2->astParent() && tok2->tokType() != Token::eLogicalOp && tok2->str() != "?") {`
`637`	`637`	`tok3 = tok2;`
`638`	`638`	`tok2 = tok2->astParent();`
`639`	`639`	`}`