From de122b16ee3e4c3c12576f311938a63ee6eeedbe Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Sat, 4 May 2019 14:31:16 +0000
Subject: lib/ui: fix UI.Exit race condition

UI.Exit can be accessed from goroutines drawing, goroutines executing
commands and goroutines waiting for events.

    Write at 0x00c0002b2040 by main goroutine:
      main.main.func1()
          /home/simon/src/aerc2/aerc.go:76 +0x33d
      git.sr.ht/~sircmpwn/aerc2/widgets.(*Aerc).BeginExCommand.func1()
          /home/simon/src/aerc2/widgets/aerc.go:245 +0x89
      git.sr.ht/~sircmpwn/aerc2/widgets.(*ExLine).Event()
          /home/simon/src/aerc2/widgets/exline.go:131 +0x442
      git.sr.ht/~sircmpwn/aerc2/widgets.(*Aerc).Event()
          /home/simon/src/aerc2/widgets/aerc.go:116 +0x83c
      git.sr.ht/~sircmpwn/aerc2/widgets.(*Aerc).simulate()
          /home/simon/src/aerc2/widgets/aerc.go:109 +0x12a
      git.sr.ht/~sircmpwn/aerc2/widgets.(*Aerc).Event()
          /home/simon/src/aerc2/widgets/aerc.go:142 +0x722
      git.sr.ht/~sircmpwn/aerc2/lib/ui.(*UI).Tick()
          /home/simon/src/aerc2/lib/ui/ui.go:75 +0x33f
      main.main()
          /home/simon/src/aerc2/aerc.go:94 +0x497

    Previous read at 0x00c0002b2040 by goroutine 19:
      git.sr.ht/~sircmpwn/aerc2/lib/ui.Initialize.func1()
          /home/simon/src/aerc2/lib/ui/ui.go:45 +0x97

    Goroutine 19 (running) created at:
      git.sr.ht/~sircmpwn/aerc2/lib/ui.Initialize()
          /home/simon/src/aerc2/lib/ui/ui.go:44 +0x372
      main.main()
          /home/simon/src/aerc2/aerc.go:87 +0x3a9
---
 aerc.go      |  4 ++--
 lib/ui/ui.go | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/aerc.go b/aerc.go
index 25a8de64..5b6f9d7f 100644
--- a/aerc.go
+++ b/aerc.go
@@ -73,7 +73,7 @@ func main() {
 					continue
 				}
 			} else if _, ok := err.(commands.ErrorExit); ok {
-				ui.Exit = true
+				ui.Exit()
 				return nil
 			} else if err != nil {
 				return err
@@ -90,7 +90,7 @@ func main() {
 	}
 	defer ui.Close()
 
-	for !ui.Exit {
+	for !ui.ShouldExit() {
 		if !ui.Tick() {
 			// ~60 FPS
 			time.Sleep(16 * time.Millisecond)
diff --git a/lib/ui/ui.go b/lib/ui/ui.go
index ced039fd..49e4dcd8 100644
--- a/lib/ui/ui.go
+++ b/lib/ui/ui.go
@@ -1,14 +1,16 @@
 package ui
 
 import (
+	"sync/atomic"
+
 	"github.com/gdamore/tcell"
 
 	"git.sr.ht/~sircmpwn/aerc2/config"
 )
 
 type UI struct {
-	Exit    bool
 	Content DrawableInteractive
+	exit    atomic.Value
 	ctx     *Context
 	screen  tcell.Screen
 
@@ -41,8 +43,9 @@ func Initialize(conf *config.AercConfig,
 		tcEvents:      make(chan tcell.Event, 10),
 		invalidations: make(chan interface{}),
 	}
+	state.exit.Store(false)
 	go (func() {
-		for !state.Exit {
+		for !state.ShouldExit() {
 			state.tcEvents <- screen.PollEvent()
 		}
 	})()
@@ -58,6 +61,14 @@ func Initialize(conf *config.AercConfig,
 	return &state, nil
 }
 
+func (state *UI) ShouldExit() bool {
+	return state.exit.Load().(bool)
+}
+
+func (state *UI) Exit() {
+	state.exit.Store(true)
+}
+
 func (state *UI) Close() {
 	state.screen.Fini()
 }
-- 
cgit