Skip to content

Commit

Permalink
fix crash with -test (slackhq#602)
Browse files Browse the repository at this point in the history
When running in `-test` mode, `tun` is set to nil. So we should move the
defer into the `!configTest` if block.

    panic: runtime error: invalid memory address or nil pointer dereference
    [signal SIGSEGV: segmentation violation code=0x1 addr=0x28 pc=0x54855c]

    goroutine 1 [running]:
    github.com/slackhq/nebula.Main.func3(0x4000135e80, {0x0, 0x0})
            github.com/slackhq/nebula/main.go:176 +0x2c
    github.com/slackhq/nebula.Main(0x400022e060, 0x1, {0x76faa0, 0x5}, 0x4000230000, 0x0)
            github.com/slackhq/nebula/main.go:316 +0x2414
    main.main()
            github.com/slackhq/nebula/cmd/nebula/main.go:54 +0x540
  • Loading branch information
wadey authored Dec 6, 2021
1 parent f60ed2b commit befce3f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@ func Main(c *config.C, configTest bool, buildVersion string, logger *logrus.Logg
if err != nil {
return nil, util.NewContextualError("Failed to get a tun/tap device", nil, err)
}
}

defer func() {
if reterr != nil {
tun.Close()
}
}()
defer func() {
if reterr != nil {
tun.Close()
}
}()
}

// set up our UDP listener
udpConns := make([]*udp.Conn, routines)
Expand Down

0 comments on commit befce3f

Please sign in to comment.