Skip to content

Commit e3d0912

Browse files
authored
Merge pull request #498 from rakshasa/fix/server-example
fix: segfault in example server without address or socket args
2 parents b4b287a + fd276e8 commit e3d0912

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

cmd/gouroboros/server.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ package main
1717
import (
1818
"flag"
1919
"fmt"
20-
ouroboros "github.com/blinklabs-io/gouroboros"
2120
"net"
2221
"os"
22+
23+
ouroboros "github.com/blinklabs-io/gouroboros"
2324
)
2425

2526
type serverFlags struct {
@@ -38,20 +39,25 @@ func newServerFlags() *serverFlags {
3839
func createListenerSocket(f *globalFlags) (net.Listener, error) {
3940
var err error
4041
var listen net.Listener
41-
if f.socket != "" {
42-
if err := os.RemoveAll(f.socket); err != nil {
42+
43+
switch {
44+
case f.socket != "":
45+
if err := os.Remove(f.socket); err != nil {
4346
return nil, fmt.Errorf("failed to remove existing socket: %s", err)
4447
}
4548
listen, err = net.Listen("unix", f.socket)
4649
if err != nil {
4750
return nil, fmt.Errorf("failed to open listening socket: %s", err)
4851
}
49-
} else if f.address != "" {
52+
case f.address != "":
5053
listen, err = net.Listen("tcp", f.address)
5154
if err != nil {
5255
return nil, fmt.Errorf("failed to open listening socket: %s", err)
5356
}
57+
default:
58+
return nil, fmt.Errorf("no listening address or socket specified")
5459
}
60+
5561
return listen, nil
5662
}
5763

0 commit comments

Comments
 (0)