blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

terminal: protect calls to terminal methods throughout aerc

Browse source 
A race condition can occur when a PartViewer is closing and also working
on a draw. The closing process sets the terminal to nil, which will
create a panic. This can be tested in development by setting the timer
in the main aerc tick loop to something very low (1 ms for example).

One other unprotected call to terminal exists in the composer widget.

Check that the terminal is not nil before calling methods on it.

Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Acked-by: Robin Jarry <robin@jarry.cc>
This commit is contained in:
Tim Culverhouse 2022-09-15 14:39:04 -05:00 committed by Robin Jarry
parent a44d1f6cc5
commit f414db7858
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
widgets/compose.go
View file

@ -812,6 +812,9 @@ func (c *Composer) termEvent(event tcell.Event) bool {
} }
func (c *Composer) termClosed(err error) { func (c *Composer) termClosed(err error) {
if c.editor == nil {
return
}
c.grid.RemoveChild(c.editor) c.grid.RemoveChild(c.editor)
c.review = newReviewMessage(c, err) c.review = newReviewMessage(c, err)
c.grid.AddChild(c.review).At(3, 0) c.grid.AddChild(c.review).At(3, 0)

2
widgets/msgviewer.go
View file

@ -859,8 +859,10 @@ func (pv *PartViewer) Draw(ctx *ui.Context) {
ctx.Printf(0, 0, style, "%s", pv.err.Error()) ctx.Printf(0, 0, style, "%s", pv.err.Error())
return return
} }
if pv.term != nil {
pv.term.Draw(ctx) pv.term.Draw(ctx)
} }
}
func (pv *PartViewer) Cleanup() { func (pv *PartViewer) Cleanup() {
if pv.term != nil { if pv.term != nil {