Skip to content

Commit 103143d

Browse files
authored
Fix #15195: False negative: bufferAccessOutOfBounds with address of member (#9012)
1 parent 4b66976 commit 103143d

2 files changed

Lines changed: 55 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, "[|."))

‎test/testbufferoverrun.cpp‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ class TestBufferOverrun : public TestFixture {
231231
TEST_CASE(buffer_overrun_37);
232232
TEST_CASE(buffer_overrun_38);
233233
TEST_CASE(buffer_overrun_39);
234+
TEST_CASE(buffer_overrun_40);
234235
TEST_CASE(buffer_overrun_errorpath);
235236
TEST_CASE(buffer_overrun_bailoutIfSwitch); // ticket #2378 : bailoutIfSwitch
236237
TEST_CASE(buffer_overrun_function_array_argument);
@@ -3692,6 +3693,46 @@ class TestBufferOverrun : public TestFixture {
36923693
errout_str());
36933694
}
36943695

3696+
void buffer_overrun_40() {
3697+
check("struct S { char a[4]; };\n"
3698+
"struct T { struct S s; };\n"
3699+
"int f(const struct T *p, const struct T *q) {\n"
3700+
" return memcmp(&p->s.a, &q->s, 16);\n"
3701+
"}\n");
3702+
ASSERT_EQUALS("[test.cpp:4:19]: (error) Buffer is accessed out of bounds: p->s.a [bufferAccessOutOfBounds]\n"
3703+
"[test.cpp:4:28]: (error) Buffer is accessed out of bounds: &q->s [bufferAccessOutOfBounds]\n",
3704+
errout_str());
3705+
3706+
check("struct S { char a[4]; };\n"
3707+
"struct T { struct S s; };\n"
3708+
"int f(const struct T *p, const struct T *q) {\n"
3709+
" return memcmp(&p->s.a, &q->s, 4);\n"
3710+
"}\n");
3711+
ASSERT_EQUALS("", errout_str());
3712+
3713+
check("struct S { char a[4]; };\n"
3714+
"struct T { struct S s; };\n"
3715+
"void f(char *d) {\n"
3716+
" struct S s;\n"
3717+
" struct T t;\n"
3718+
" memcpy(d, &s.a, 16);\n"
3719+
" memcpy(d, &s.a[0], 16);\n"
3720+
" memcpy(d, &t.s, 16);\n"
3721+
"}\n");
3722+
ASSERT_EQUALS("[test.cpp:6:15]: (error) Buffer is accessed out of bounds: s.a [bufferAccessOutOfBounds]\n"
3723+
"[test.cpp:7:15]: (error) Buffer is accessed out of bounds: &s.a[0] [bufferAccessOutOfBounds]\n"
3724+
"[test.cpp:8:15]: (error) Buffer is accessed out of bounds: &t.s [bufferAccessOutOfBounds]\n",
3725+
errout_str());
3726+
3727+
check("struct Foo { int n; char data[1]; };\n"
3728+
"void f(struct Foo *p, const char *src) {\n"
3729+
" memcpy(p->data, src, 10);\n"
3730+
" memcpy(&p->data, src, 10);\n"
3731+
" memcpy(&p->data[0], src, 10);\n"
3732+
"}\n");
3733+
ASSERT_EQUALS("", errout_str());
3734+
}
3735+
36953736
void buffer_overrun_errorpath() {
36963737
setMultiline();
36973738
Settings s = settings0;

0 commit comments

Comments
 (0)