* net/eww.el (eww-read-bookmarks): Check file size.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index badc5be27f9877ebbd645a8ef95bfb40c120aa5d..379a1ec9f7d18b10fe76745ad61ea326b560dc84 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-27  Leo Liu  <sdl.web@gmail.com>
+
+       * net/eww.el (eww-read-bookmarks): Check file size.
+
 2013-06-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/nadvice.el (advice--defalias-fset): Move advice back to

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 3579f656a1df2572c9384717fe435e544a25beaa..63fe930b4ae5f9e3766ad8df75e03435b09f639c 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -965,10 +965,12 @@ The browser to used is specified by the `shr-external-browser' variable."
     (pp eww-bookmarks (current-buffer))))
 
 (defun eww-read-bookmarks ()
-  (with-temp-buffer
-    (insert-file-contents
-     (expand-file-name "eww-bookmarks" user-emacs-directory))
-    (setq eww-bookmarks (read (current-buffer)))))
+  (let ((file (expand-file-name "eww-bookmarks" user-emacs-directory)))
+    (setq eww-bookmarks
+         (unless (zerop (or (nth 7 (file-attributes file)) 0))
+           (with-temp-buffer
+             (insert-file-contents file)
+             (read (current-buffer)))))))
 
 (defun eww-list-bookmarks ()
   "Display the bookmarks."