From 1538bc03811f9bb7b4aaf1a3f935dfbdf997d062 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 1 Oct 2019 14:37:46 +0200 Subject: manager: do not panic if we can't yet get a config Reported-by: Jonathan Tooker Signed-off-by: Jason A. Donenfeld --- manager/ipc_server.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/manager/ipc_server.go b/manager/ipc_server.go index 29cf2e37..1367c2e9 100644 --- a/manager/ipc_server.go +++ b/manager/ipc_server.go @@ -273,6 +273,9 @@ func (s *ManagerService) ServeConn(reader io.Reader, writer io.Writer) { return } config, retErr := s.StoredConfig(tunnelName) + if config == nil { + config = &conf.Config{} + } err = encoder.Encode(*config) if err != nil { return @@ -288,6 +291,9 @@ func (s *ManagerService) ServeConn(reader io.Reader, writer io.Writer) { return } config, retErr := s.RuntimeConfig(tunnelName) + if config == nil { + config = &conf.Config{} + } err = encoder.Encode(*config) if err != nil { return -- cgit v1.2.3-59-g8ed1b