[tor-commits] [sandboxed-tor-browser/master] Fix a nil pointer deref on SIGINT received durring bootstrap.

[yawning at torproject.org]

commit 747d691087525c68d9b2fb94b4f664b55a433b39
Author: Yawning Angel <yawning at schwanenlied.me>
Date:   Thu Dec 15 19:28:31 2016 +0000

    Fix a nil pointer deref on SIGINT received durring bootstrap.
---
 ChangeLog                                         | 1 +
 src/cmd/sandboxed-tor-browser/internal/tor/tor.go | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ed63781..5e3ee14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Changes in version 0.0.3 - UNRELEASED:
    on certain pages.
  * Bug 20973: Silence Gdk warnings on systems with integrated png loader.
  * Bug 20806: Try even harder to exclude gstreamer.
+ * Fix a nil pointer deref on SIGINT received durring bootstrap.
  * Per the browser developers, the initial 7.0 alpha builds will not be ESR52
    based, with a switch mid-alpha series, so keep the Grsec PaX override
    around till 7.0.0 release.
diff --git a/src/cmd/sandboxed-tor-browser/internal/tor/tor.go b/src/cmd/sandboxed-tor-browser/internal/tor/tor.go
index e3dd047..0de3b6d 100644
--- a/src/cmd/sandboxed-tor-browser/internal/tor/tor.go
+++ b/src/cmd/sandboxed-tor-browser/internal/tor/tor.go
@@ -371,6 +371,9 @@ func (t *Tor) DoBootstrap(cfg *config.Config, async *Async) (err error) {
 		select {
 		case ev := <-t.ctrlEvents:
 			const evPrefix = "STATUS_CLIENT "
+			if ev == nil {
+				return ErrCanceled
+			}
 			if !strings.HasPrefix(ev.Reply, evPrefix) {
 				continue
 			}