aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-10-01 14:37:46 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-10-01 14:41:18 +0200
commit1538bc03811f9bb7b4aaf1a3f935dfbdf997d062 (patch)
tree400dc30e0c4a879efcf7eb62810383e94dd0b94a
parentmanager: print panic stack trace in one missing part (diff)
downloadwireguard-windows-1538bc03811f9bb7b4aaf1a3f935dfbdf997d062.tar.xz
wireguard-windows-1538bc03811f9bb7b4aaf1a3f935dfbdf997d062.zip
manager: do not panic if we can't yet get a config
Reported-by: Jonathan Tooker <jonathan.tooker@netprotect.com> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to '')
-rw-r--r--manager/ipc_server.go6
1 files changed, 6 insertions, 0 deletions
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