diff options
| author | Paul Eggert | 2012-12-10 15:16:28 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-12-10 15:16:28 -0800 |
| commit | 645c6a30a7779cc313165591e4f1c3bf000c8166 (patch) | |
| tree | 9e545e02126a42ef5e9979d13a37c8984335710a | |
| parent | 184246dffc551d4e84b4b716a2952a0fbd475bf1 (diff) | |
| download | emacs-645c6a30a7779cc313165591e4f1c3bf000c8166.tar.gz emacs-645c6a30a7779cc313165591e4f1c3bf000c8166.zip | |
* fileio.c (Fverify_visited_file_modtime): Don't read uninitialized st.st_size.
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/fileio.c | 4 |
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 @@ | |||
| 2 | 2 | ||
| 3 | * fileio.c (Fvisited_file_modtime): Return (-1 ...) for nonexistent | 3 | * fileio.c (Fvisited_file_modtime): Return (-1 ...) for nonexistent |
| 4 | files, fixing a regression from 24.2. | 4 | files, fixing a regression from 24.2. |
| 5 | (Fverify_visited_file_modtime): Don't read uninitialized st.st_size. | ||
| 5 | 6 | ||
| 6 | 2012-12-08 Jan Djärv <jan.h.d@swipnet.se> | 7 | 2012-12-08 Jan Djärv <jan.h.d@swipnet.se> |
| 7 | 8 | ||
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. */) | |||
| 5150 | ? sub_emacs_time (b->modtime, mtime) | 5150 | ? sub_emacs_time (b->modtime, mtime) |
| 5151 | : sub_emacs_time (mtime, b->modtime))), | 5151 | : sub_emacs_time (mtime, b->modtime))), |
| 5152 | EMACS_TIME_LE (diff, make_emacs_time (1, 0))))) | 5152 | EMACS_TIME_LE (diff, make_emacs_time (1, 0))))) |
| 5153 | && (st.st_size == b->modtime_size | 5153 | && (b->modtime_size < 0 |
| 5154 | || b->modtime_size < 0)) | 5154 | || st.st_size == b->modtime_size)) |
| 5155 | return Qt; | 5155 | return Qt; |
| 5156 | return Qnil; | 5156 | return Qnil; |
| 5157 | } | 5157 | } |