Merge pull request #43 from wolf-joe/fix_panic

feat: fix panic
wolf-joe · Dec 22, 2022 · f29b1cd · f29b1cd
2 parents f7ac1b2 + e3c4711
commit f29b1cd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/inbound/handler.go b/inbound/handler.go
@@ -3,18 +3,19 @@ package inbound
 import (
 	"errors"
 	"fmt"
+	"strconv"
+	"strings"
+	"sync/atomic"
+	"time"
+	"unsafe"
+
 	"github.com/miekg/dns"
 	"github.com/sirupsen/logrus"
 	"github.com/wolf-joe/ts-dns/cache"
 	"github.com/wolf-joe/ts-dns/config"
 	"github.com/wolf-joe/ts-dns/hosts"
 	"github.com/wolf-joe/ts-dns/outbound"
 	"github.com/wolf-joe/ts-dns/redirector"
-	"strconv"
-	"strings"
-	"sync/atomic"
-	"time"
-	"unsafe"
 )
 
 // region interface

diff --git a/redirector/redirector.go b/redirector/redirector.go
@@ -3,14 +3,15 @@ package redirector
 import (
 	"bufio"
 	"fmt"
+	"net"
+	"os"
+	"strings"
+
 	"github.com/miekg/dns"
 	"github.com/sirupsen/logrus"
 	"github.com/wolf-joe/ts-dns/config"
 	"github.com/wolf-joe/ts-dns/outbound"
 	"github.com/yl2chen/cidranger"
-	"net"
-	"os"
-	"strings"
 )
 
 const (
@@ -49,7 +50,7 @@ func NewRedirector(globalConf config.Conf, groups map[string]outbound.IGroup) (R
 	// return runtime redirector
 	redirector := func(src outbound.IGroup, req, resp *dns.Msg) outbound.IGroup {
 		instance, exists := group2redir[src.Name()]
-		if !exists {
+		if resp == nil || !exists {
 			return nil
 		}
 		newGroup := instance.Redirect(req, resp)