summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-12-10 15:16:28 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2012-12-10 15:16:28 -0800
commit645c6a30a7779cc313165591e4f1c3bf000c8166 (patch)
tree9e545e02126a42ef5e9979d13a37c8984335710a
parent184246dffc551d4e84b4b716a2952a0fbd475bf1 (diff)
downloademacs-645c6a30a7779cc313165591e4f1c3bf000c8166.tar.gz
* fileio.c (Fverify_visited_file_modtime): Don't read uninitialized st.st_size.
-rw-r--r--src/ChangeLog1
-rw-r--r--src/fileio.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c66d917f94f..b3c7a5e6549 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
* fileio.c (Fvisited_file_modtime): Return (-1 ...) for nonexistent
files, fixing a regression from 24.2.
+ (Fverify_visited_file_modtime): Don't read uninitialized st.st_size.
2012-12-08 Jan Djärv <jan.h.d@swipnet.se>
diff --git a/src/fileio.c b/src/fileio.c
index 49a6740d93a..7e1ba71c822 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5150,8 +5150,8 @@ See Info node `(elisp)Modification Time' for more details. */)
? sub_emacs_time (b->modtime, mtime)
: sub_emacs_time (mtime, b->modtime))),
EMACS_TIME_LE (diff, make_emacs_time (1, 0)))))
- && (st.st_size == b->modtime_size
- || b->modtime_size < 0))
+ && (b->modtime_size < 0
+ || st.st_size == b->modtime_size))
return Qt;
return Qnil;
}