diff options
| author | Robin Jarry <robin@jarry.cc> | 2022-02-25 00:21:06 +0100 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2022-02-25 13:56:53 +0100 |
| commit | c26d08103b327bd3f2470e542aa55ab354483347 (patch) | |
| tree | 4c0567246916d676b71a4675c76a93a198add65f /commands/msgview/next.go | |
| parent | 91ead11c47252ca8998fdad7b0770d6b8d07c987 (diff) | |
| download | aerc-c26d08103b327bd3f2470e542aa55ab354483347.zip | |
aerc: always check SelectedAccount return value
aerc.SelectedAccount() is used in lots of places. Most of them without
checking the return value.
In some cases, the currently selected tab is not related to any account
(widget.Terminal for example). This can lead to unexpected crashes when
accessing account specific configuration.
When possible, return an error when no account is currently selected.
If no error can be returned, fallback to non-account specific
configuration.
Signed-off-by: Robin Jarry <robin@jarry.cc>
Reviewed-by: Koni Marti <koni.marti@gmail.com>
Diffstat (limited to 'commands/msgview/next.go')
| -rw-r--r-- | commands/msgview/next.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/commands/msgview/next.go b/commands/msgview/next.go index 4291a6a..742bc66 100644 --- a/commands/msgview/next.go +++ b/commands/msgview/next.go @@ -1,6 +1,8 @@ package msgview import ( + "errors" + "git.sr.ht/~rjarry/aerc/commands/account" "git.sr.ht/~rjarry/aerc/lib" "git.sr.ht/~rjarry/aerc/widgets" @@ -27,6 +29,9 @@ func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error { } mv, _ := aerc.SelectedTab().(*widgets.MessageViewer) acct := mv.SelectedAccount() + if acct == nil { + return errors.New("No account selected") + } store := mv.Store() err = account.ExecuteNextPrevMessage(args, acct, pct, n) if err != nil { |