Skip to content

Commit 76406a8

Browse files
committed
fix
1 parent e3c5aa6 commit 76406a8

1 file changed

Lines changed: 14 additions & 2 deletions

File tree

‎lib/checkbufferoverrun.cpp‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,10 @@ ValueFlow::Value CheckBufferOverrunImpl::getBufferSize(const Token *bufTok, cons
585585
}
586586
bufTok = bufTok->astOperand1();
587587
}
588+
while (Token::Match(bufTok, ".|::"))
589+
bufTok = bufTok->astOperand2();
590+
if (!bufTok)
591+
return ValueFlow::Value(-1);
588592
}
589593
const Variable *var = bufTok->variable();
590594

@@ -756,8 +760,16 @@ void CheckBufferOverrunImpl::bufferOverflow()
756760
if (bufferSize.intvalue <= 0)
757761
continue;
758762
// buffer size == 1 => do not warn for dynamic memory
759-
if (bufferSize.intvalue == 1 && Token::simpleMatch(argtok->astParent(), ".")) { // TODO: check if parent was allocated dynamically
760-
const Token *tok2 = argtok;
763+
const Token *memberTok = argtok;
764+
if (memberTok->isUnaryOp("&")) {
765+
memberTok = memberTok->astOperand1();
766+
if (Token::simpleMatch(memberTok, "["))
767+
memberTok = memberTok->astOperand1();
768+
while (Token::Match(memberTok, ".|::"))
769+
memberTok = memberTok->astOperand2();
770+
}
771+
if (bufferSize.intvalue == 1 && memberTok && Token::simpleMatch(memberTok->astParent(), ".")) { // TODO: check if parent was allocated dynamically
772+
const Token *tok2 = memberTok;
761773
while (Token::simpleMatch(tok2->astParent(), "."))
762774
tok2 = tok2->astParent();
763775
while (Token::Match(tok2, "[|."))

0 commit comments

Comments
 (0)