walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'master' of https://www.github.com/danmar/cppcheck

This commit is contained in:
orbitcowboy 2019-12-20 09:48:03 +01:00
parent 18b8db1e15 9ffb657c1a
commit da1b17e4fb
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkbufferoverrun.cpp
View File

@ -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();
}

5
test/testbufferoverrun.cpp
View File

@ -4099,6 +4099,11 @@ private:
" 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() {