From a1c413f76944ab76977bc650a1de0ee254c9174f Mon Sep 17 00:00:00 2001 From: Arceliar Date: Sun, 6 Oct 2019 11:53:14 -0500 Subject: [PATCH] fix nil pointer dereference in yggdrasil.Conn.search --- src/yggdrasil/conn.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/yggdrasil/conn.go b/src/yggdrasil/conn.go index 4daf6a4..bb5964b 100644 --- a/src/yggdrasil/conn.go +++ b/src/yggdrasil/conn.go @@ -115,12 +115,12 @@ func (c *Conn) search() error { default: if sinfo != nil { // Finish initializing the session - sinfo.setConn(nil, c) - } - c.session = sinfo - c.nodeID = crypto.GetNodeID(&c.session.theirPermPub) - for i := range c.nodeMask { - c.nodeMask[i] = 0xFF + c.session = sinfo + c.session.setConn(nil, c) + c.nodeID = crypto.GetNodeID(&c.session.theirPermPub) + for i := range c.nodeMask { + c.nodeMask[i] = 0xFF + } } err = e close(done)