From e44823f8a69af1201fcf49a548bf0302aefd4e2a Mon Sep 17 00:00:00 2001 From: mzz2017 Date: Sat, 28 Dec 2019 02:53:05 +0800 Subject: [PATCH] fix: a nil pointer bug that may cause crash --- gui/src/components/modalSetting.vue | 4 ++-- service/model/shadowsocksr/ssr.go | 4 +++- ssr.md | 0 3 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 ssr.md diff --git a/gui/src/components/modalSetting.vue b/gui/src/components/modalSetting.vue index 6f6490ec..5796e1a9 100644 --- a/gui/src/components/modalSetting.vue +++ b/gui/src/components/modalSetting.vue @@ -154,7 +154,7 @@ TCPFastOpen @@ -176,7 +176,7 @@ 多路复用 diff --git a/service/model/shadowsocksr/ssr.go b/service/model/shadowsocksr/ssr.go index 80513a6f..879728aa 100644 --- a/service/model/shadowsocksr/ssr.go +++ b/service/model/shadowsocksr/ssr.go @@ -54,7 +54,9 @@ func (self *SSR) Serve(localPort int, cipher, passwd, address, port, obfs, obfsP } }() <-self.c - _ = local.(*socks5.Socks5).TcpListener.Close() + if local.(*socks5.Socks5).TcpListener != nil { + _ = local.(*socks5.Socks5).TcpListener.Close() + } }() return err } diff --git a/ssr.md b/ssr.md deleted file mode 100644 index e69de29b..00000000