github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-25 09:39:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

reader: Check bounds for color

Browse Source 
This fixes a crash when you open the history pager and then do
history-token-search-backward (e.g. alt+. or alt-up).

It would sometimes crash because the `colors.at(i)` was an
out-of-bounds access.

Note: This might still leave the highlighting offset in some
cases (not quite sure why), but at least it doesn't *crash*, and the
search generally *works*.
This commit is contained in:
Fabian Boehm 2022-08-26 15:02:05 +02:00
parent ec8a7d09c6
commit 4dfcd4cb4e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/reader.cpp
View File

@ -1169,7 +1169,13 @@ void reader_data_t::paint_layout(const wchar_t *reason) {
// Highlight any history search. // Highlight any history search.
if (!conf.in_silent_mode && data.history_search_range) { if (!conf.in_silent_mode && data.history_search_range) {
for (size_t i = data.history_search_range->start; i < data.history_search_range->end(); // std::min gets confused about types here.
size_t end = data.history_search_range->end();
if (colors.size() < end) {
end = colors.size();
}
for (size_t i = data.history_search_range->start; i < end;
i++) { i++) {
colors.at(i).background = highlight_role_t::search_match; colors.at(i).background = highlight_role_t::search_match;
} }
@ -1178,7 +1184,8 @@ void reader_data_t::paint_layout(const wchar_t *reason) {
// Apply any selection. // Apply any selection.
if (data.selection.has_value()) { if (data.selection.has_value()) {
highlight_spec_t selection_color = {highlight_role_t::normal, highlight_role_t::selection}; highlight_spec_t selection_color = {highlight_role_t::normal, highlight_role_t::selection};
for (size_t i = data.selection->start; i < std::min(selection->stop, colors.size()); i++) { auto end = std::min(selection->stop, colors.size());
for (size_t i = data.selection->start; i < end; i++) {
colors.at(i) = selection_color; colors.at(i) = selection_color;
} }
} }