dns: close the connection if receiving zero packet on serveTCPClient

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/dns/server.go b/lib/dns/server.go
index d23c606e..000dea1f 100644
--- a/lib/dns/server.go
+++ b/lib/dns/server.go
@@ -619,19 +619,19 @@ func (srv *Server) incForwarder() {
 }
 
 func (srv *Server) serveTCPClient(cl *TCPClient, kind connType) {
-	var (
-		err error
-	)
 	for {
 		req := newRequest()
 
-		_, err = cl.recv(req.message)
+		n, err := cl.recv(req.message)
 		if err != nil {
 			if err == io.EOF {
 				goto out
 			}
 			continue
 		}
+		if n == 0 || len(req.message.Packet) == 0 {
+			goto out
+		}
 
 		req.kind = kind
 		req.writer = cl
@@ -646,7 +646,7 @@ func (srv *Server) serveTCPClient(cl *TCPClient, kind connType) {
 		srv.requestq <- req
 	}
 out:
-	err = cl.conn.Close()
+	err := cl.conn.Close()
 	if err != nil {
 		log.Println("serveTCPClient: conn.Close:", err)
 	}