From fec0ac6ea5392149012dfa90f429007102f3836a Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Mon, 1 Dec 2014 17:01:55 -0600
Subject: [PATCH] dht: Improve bad KRPC message screening

---
 dht/dht.go | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/dht/dht.go b/dht/dht.go
index 8db143c8..ec8e86e7 100644
--- a/dht/dht.go
+++ b/dht/dht.go
@@ -289,14 +289,17 @@ func (s *Server) processPacket(b []byte, addr dHTAddr) {
 	var d Msg
 	err := bencode.Unmarshal(b, &d)
 	if err != nil {
-		if se, ok := err.(*bencode.SyntaxError); !ok || se.Offset != 0 {
-			log.Printf("%s: received bad krpc message: %s%s", s, err, func() string {
-				if se.What == io.ErrUnexpectedEOF {
-					return ""
+		func() {
+			if se, ok := err.(*bencode.SyntaxError); ok {
+				if b[se.Offset] == 0 {
+					return
 				}
-				return fmt.Sprintf(": %q", b)
-			}())
-		}
+				if se.Offset == 0 {
+					return
+				}
+			}
+			log.Printf("%s: received bad krpc message: %s: %q", s, err, b)
+		}()
 		return
 	}
 	s.mu.Lock()
-- 
2.48.1