encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

diagnostic: Fix stupid bug in Formatter::format 

That would cause OOB reads.

Fixed: tint:836
Change-Id: I6e44ab5d140e99a701c190c13ed6aaba762e19d4
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/53660
Auto-Submit: Ben Clayton <bclayton@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
Ben Clayton 2021-06-07 16:53:32 +00:00 committed by Tint LUCI CQ
parent 224ce729cc
commit b2a7d8b9b0
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/diagnostic/formatter.cc
View File

@ -212,7 +212,8 @@ void Formatter::format(const Diagnostic& diag, State& state) const {
state.set_style({Color::kDefault, false}); state.set_style({Color::kDefault, false});
for (size_t line_num = rng.begin.line; for (size_t line_num = rng.begin.line;
(line_num <= rng.end.line) && (src.file_content->lines.size() + 1); (line_num <= rng.end.line) &&
(line_num <= src.file_content->lines.size());
line_num++) { line_num++) {
auto& line = src.file_content->lines[line_num - 1]; auto& line = src.file_content->lines[line_num - 1];
auto line_len = line.size(); auto line_len = line.size();

11
src/diagnostic/formatter_test.cc
View File

@ -216,6 +216,17 @@ the snail says ???
ASSERT_EQ(expect, got); ASSERT_EQ(expect, got);
} }
TEST_F(DiagFormatterTest, RangeOOB) {
Formatter fmt{{true, true, true, true}};
diag::List list;
list.add_error("oob", Source{{{10, 20}, {30, 20}}, &file});
auto got = fmt.format(list);
auto* expect = R"(file.name:10:20 error: oob
)";
ASSERT_EQ(expect, got);
}
} // namespace } // namespace
} // namespace diag } // namespace diag
} // namespace tint } // namespace tint