From: yamaoka <yamaoka>
Date: Sun, 18 Dec 2005 02:56:04 +0000 (+0000)
Subject: Synch No Gnus 200512180014.
X-Git-Tag: t-gnus-6_17_4-quimby-~172
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=31c2d28954e12186abf163efda39de9c53183a68;p=elisp%2Fgnus.git-

Synch No Gnus 200512180014.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e1ab882..47b21dd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* dns.el (query-dns): Make sure we check the buffer size before
+	removing tcp headers.
+
 2005-12-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-art.el (gnus-article-delete-text-of-type): Enable it to
diff --git a/lisp/dns.el b/lisp/dns.el
index 2229b0a..98c07bf 100644
--- a/lisp/dns.el
+++ b/lisp/dns.el
@@ -406,7 +406,8 @@ If REVERSEP, look up an IP address."
 	    (decf times step))
 	  (ignore-errors
 	    (delete-process process))
-	  (when tcp-p
+	  (when (and tcp-p
+		     (>= (buffer-size) 2))
 	    (goto-char (point-min))
 	    (delete-region (point) (+ (point) 2)))
 	  (unless (zerop (buffer-size))