From b053aaa145cd29f6990bf1599243a0a0c6a5af17 Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Thu, 26 Nov 2020 06:32:41 +0200 Subject: [PATCH] listing: prevent invalid area in print_account() --- src/components/mail/listing.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/mail/listing.rs b/src/components/mail/listing.rs index debcdf4b1..7bfee75b5 100644 --- a/src/components/mail/listing.rs +++ b/src/components/mail/listing.rs @@ -1468,6 +1468,9 @@ impl Listing { self.dirty = false; let mut y = get_y(upper_left); for a in &self.accounts { + if y > get_y(bottom_right) { + break; + } y += self.print_account(grid, (set_y(upper_left, y), bottom_right), &a, context); y += 3; } @@ -1484,9 +1487,7 @@ impl Listing { a: &AccountMenuEntry, context: &mut Context, ) -> usize { - if !is_valid_area!(area) { - debug!("BUG: invalid area in print_account"); - } + debug_assert!(is_valid_area!(area)); // Each entry and its index in the account let mailboxes: HashMap = context.accounts[a.index] .mailbox_entries