From: Leo Liu <sdl.web@gmail.com>
Date: Sat, 1 Dec 2012 15:45:38 +0000 (+0800)
Subject: * lisp/files.el (dir-locals-read-from-file): Check file non-empty
X-Git-Tag: emacs-24.2.91~62
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ff3d86d0996d665f9cbb217ca24a63e59b058460;p=emacs.git

* lisp/files.el (dir-locals-read-from-file): Check file non-empty
before reading.

Fixes: debbugs:13038
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 735798e3f3e..eb41fff8c9a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-01  Leo Liu  <sdl.web@gmail.com>
+
+	* files.el (dir-locals-read-from-file): Check file non-empty
+	before reading.  (Bug#13038)
+
 2012-11-28  Glenn Morris  <rgm@gnu.org>
 
 	* jka-cmpr-hook.el (jka-compr-get-compression-info):
diff --git a/lisp/files.el b/lisp/files.el
index 51f8256f71a..62ad96cf28c 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3625,14 +3625,15 @@ is found.  Returns the new class name."
       (condition-case err
 	  (progn
 	    (insert-file-contents file)
-	    (let* ((dir-name (file-name-directory file))
-		   (class-name (intern dir-name))
-		   (variables (let ((read-circle nil))
-				(read (current-buffer)))))
-	      (dir-locals-set-class-variables class-name variables)
-	      (dir-locals-set-directory-class dir-name class-name
-					      (nth 5 (file-attributes file)))
-	      class-name))
+	    (unless (zerop (buffer-size))
+	      (let* ((dir-name (file-name-directory file))
+		     (class-name (intern dir-name))
+		     (variables (let ((read-circle nil))
+				  (read (current-buffer)))))
+		(dir-locals-set-class-variables class-name variables)
+		(dir-locals-set-directory-class dir-name class-name
+						(nth 5 (file-attributes file)))
+		class-name)))
 	(error (message "Error reading dir-locals: %S" err) nil)))))
 
 (defcustom enable-remote-dir-locals nil