fix null pointer bug

zu1k · Sep 6, 2020 · 87f1fff · 87f1fff
1 parent 49b1c69
commit 87f1fff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/api/router.go b/api/router.go
@@ -14,7 +14,7 @@ import (
 	"github.com/zu1k/proxypool/pkg/provider"
 )
 
-const version = "v0.3.7"
+const version = "v0.3.8"
 
 var router *gin.Engine
 

diff --git a/pkg/proxy/convert.go b/pkg/proxy/convert.go
@@ -7,10 +7,13 @@ import (
 )
 
 func SS2SSR(ss *Shadowsocks) (ssr *ShadowsocksR, err error) {
+	if ss == nil {
+		return nil, errors.New("ss is nil")
+	}
 	if !tool.CheckInList(SSRCipherList, ss.Cipher) {
 		return nil, errors.New("cipher not support")
 	}
-	base := ssr.Base
+	base := ss.Base
 	base.Type = "ssr"
 	return &ShadowsocksR{
 		Base:     base,
@@ -23,6 +26,9 @@ func SS2SSR(ss *Shadowsocks) (ssr *ShadowsocksR, err error) {
 }
 
 func SSR2SS(ssr *ShadowsocksR) (ss *Shadowsocks, err error) {
+	if ssr == nil {
+		return nil, errors.New("ssr is nil")
+	}
 	if !tool.CheckInList(SSCipherList, ssr.Cipher) {
 		return nil, errors.New("cipher not support")
 	}