[Emacs-diffs] trunk r113196: * net/eww.el (eww-read-bookmarks): Check file size.

[Leo Liu]

------------------------------------------------------------
revno: 113196
revision-id: address@hidden
parent: address@hidden
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Thu 2013-06-27 12:27:53 +0800
message:
  * net/eww.el (eww-read-bookmarks): Check file size.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-26 22:31:19 +0000
+++ b/lisp/ChangeLog    2013-06-27 04:27:53 +0000
@@ -1,3 +1,7 @@
+2013-06-27  Leo Liu  <address@hidden>
+
+       * net/eww.el (eww-read-bookmarks): Check file size.
+
 2013-06-26  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/nadvice.el (advice--defalias-fset): Move advice back to

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2013-06-26 17:14:46 +0000
+++ b/lisp/net/eww.el   2013-06-27 04:27:53 +0000
@@ -965,10 +965,12 @@
     (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."