@@ -3537,7 +3537,7 @@ class TestBufferOverrun : public TestFixture {
35373537 " }\n " );
35383538 TODO_ASSERT_EQUALS (" [test.cpp:3:12]: (error) Buffer is accessed out of bounds: &a[5] [bufferAccessOutOfBounds]\n "
35393539 " [test.cpp:7:12]: (error) Buffer is accessed out of bounds: &a[0][0] [bufferAccessOutOfBounds]\n " ,
3540- " " ,
3540+ " [test.cpp:3:12]: (error) Buffer is accessed out of bounds: &a[5] [bufferAccessOutOfBounds] \n " ,
35413541 errout_str ());
35423542
35433543 check (" void f() {\n " // #14866
@@ -3552,11 +3552,12 @@ class TestBufferOverrun : public TestFixture {
35523552 " }\n " );
35533553 ASSERT_EQUALS (" [test.cpp:3:17]: (error) Buffer is accessed out of bounds: &buf[0] [bufferAccessOutOfBounds]\n " , errout_str ());
35543554
3555- check (" void f(FILE *fp) {\n " // #14929
3556- " std::string s;\n "
3557- " fwrite(&s, 1, 1, fp);\n "
3555+ check (" void f() {\n "
3556+ " int a[5];\n "
3557+ " for (int i = 0; i < 5; ++i)\n "
3558+ " memset(&a[i], 0, sizeof(a));\n "
35583559 " }\n " );
3559- ASSERT_EQUALS (" " , errout_str ()); // don't crash
3560+ ASSERT_EQUALS (" [test.cpp:4:16]: (error) Buffer is accessed out of bounds: &a[i] [bufferAccessOutOfBounds] \n " , errout_str ());
35603561 }
35613562
35623563 void buffer_overrun_errorpath () {
@@ -3814,7 +3815,7 @@ class TestBufferOverrun : public TestFixture {
38143815 " int i[10];\n "
38153816 " memset(&i[1], 0, 1000);\n "
38163817 " }" );
3817- TODO_ASSERT_EQUALS (" [test.cpp:3:10]: (error) Buffer is accessed out of bounds: &i[1] [bufferAccessOutOfBounds]\n " , " " , errout_str ());
3818+ ASSERT_EQUALS (" [test.cpp:3:10]: (error) Buffer is accessed out of bounds: &i[1] [bufferAccessOutOfBounds]\n " , errout_str ());
38183819
38193820 check (" struct S { int x; };\n " // #8616
38203821 " void f() {\n "
0 commit comments