auto upstream

1 files changed, 22 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c85e0a789ea..a7b8ab7855b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2013-01-18  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Fix crash when inserting data from non-regular files.  See
+        http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00406.html
+        for the error description produced by valgrind.
+        * fileio.c (read_non_regular): Rename to read_contents.
+        Free Lisp_Save_Value object used to pass parameters.
+        (read_non_regular_quit): Rename to read_contents_quit.
+        (Finsert_file_contents): Redesign internal file reading loop to adjust
+        gap and end positions after each read and so help make_gap to work
+        properly.  Do not signal an I/O error too early and so do not leave
+        not yet decoded characters in a buffer, which was the reason of
+        redisplay crash.  Use list2 to build return value.  Adjust comments.
+
+2013-01-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Close a race when statting and reading files (Bug#13149).
+        * fileio.c (Finsert_file_contents): Use open+fstat, not stat+open.
+        This avoids a race if the file is renamed between stat and open.
+        This race is not the problem originally noted in Bug#13149;
+        see <http://bugs.gnu.org/13149#73> and later messages in the thread.
+
 2013-01-17  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * lisp.h (toplevel): Add comment about using Lisp_Save_Value