Fix ResponseMessage nil bug

shawn1m · Jan 2, 2019 · a0a7af5 · a0a7af5
1 parent afefc6b
commit a0a7af5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/core/inbound/server.go b/core/inbound/server.go
@@ -62,9 +62,14 @@ func (s *Server) ServeDNS(w dns.ResponseWriter, q *dns.Msg) {
 
 	cb := d.ActiveClientBundle
 
+	if cb.ResponseMessage == nil {
+		return
+	}
+
 	err := w.WriteMsg(cb.ResponseMessage)
 	if err != nil {
 		log.Warn("Write message fail:", cb.ResponseMessage)
+		return
 	}
 }
 

diff --git a/core/outbound/dispatcher.go b/core/outbound/dispatcher.go
@@ -148,8 +148,8 @@ func (d *Dispatcher) ChooseActiveClientBundle() {
 			}
 			if common.IsIPMatchList(net.ParseIP(a.(*dns.AAAA).AAAA.String()), d.IPNetworkAlternativeList, true, "alternative") {
 				d.ActiveClientBundle = d.AlternativeClientBundle
-				return
 				log.Debug("Finally use alternative DNS")
+				return
 			}
 		}
 		log.Debug("IP network match failed, finally use alternative DNS")