meli
/
meli
8
Fork 13
Code Issues 10 Pull Requests 10 Actions Packages Projects 1 Releases 18 Wiki Activity

utilities/StatusBar: fix lack of bounds checking in hist_area

jmap-eventsource
Manos Pitsidianakis 2020-11-24 10:38:34 +02:00
parent b46cd09ca6
commit 79345b3e84
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
1 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/components/utilities.rs
View File

@ -304,15 +304,19 @@ impl Component for StatusBar {
} }
let hist_height = std::cmp::min(15, self.auto_complete.suggestions().len()); let hist_height = std::cmp::min(15, self.auto_complete.suggestions().len());
let hist_area = if height < self.auto_complete.suggestions().len() { let hist_area = if height < self.auto_complete.suggestions().len() {
let hist_area = (
(
get_x(upper_left),
std::cmp::min(
get_y(bottom_right) - height - hist_height + 1,
get_y(bottom_right),
),
),
pos_dec(bottom_right, (0, height)),
);
ScrollBar::default().set_show_arrows(false).draw( ScrollBar::default().set_show_arrows(false).draw(
grid, grid,
( hist_area,
(
get_x(upper_left),
get_y(bottom_right) - height - hist_height + 1,
),
set_y(bottom_right, get_y(bottom_right) - height),
),
context, context,
self.auto_complete.cursor(), self.auto_complete.cursor(),
hist_height, hist_height,
@ -320,37 +324,22 @@ impl Component for StatusBar {
); );
change_colors( change_colors(
grid, grid,
( hist_area,
(
get_x(upper_left),
get_y(bottom_right) - height - hist_height + 1,
),
set_y(bottom_right, get_y(bottom_right) - height),
),
Color::Byte(197), // DeepPink2, Color::Byte(197), // DeepPink2,
Color::Byte(174), //LightPink3 Color::Byte(174), //LightPink3
); );
context.dirty_areas.push_back(( context.dirty_areas.push_back(hist_area);
( hist_area
get_x(upper_left),
get_y(bottom_right) - height - hist_height + 1,
),
set_y(bottom_right, get_y(bottom_right) - height),
));
(
(
get_x(upper_left) + 1,
get_y(bottom_right) - height - hist_height + 1,
),
set_y(bottom_right, get_y(bottom_right) - height),
)
} else { } else {
( (
( (
get_x(upper_left), get_x(upper_left),
get_y(bottom_right) - height - hist_height + 1, std::cmp::min(
get_y(bottom_right) - height - hist_height + 1,
get_y(bottom_right),
),
), ),
set_y(bottom_right, get_y(bottom_right) - height), pos_dec(bottom_right, (0, height)),
) )
}; };
let offset = if hist_height let offset = if hist_height