insert-file-contents beware buffer relocation

This fixes a potential (albeit quite unlikely) bug
introduced during recent fixes to Bug#77315.
* src/fileio.c (union read_non_regular.s.inserted):
Bring back this member.
(read_non_regular, Finsert_file_contents): Work in the unlikely
case when internal_condition_case_1 relocates the buffer before
calling read_non_regular.

(cherry picked from commit 49ca3a2151abb1188765c04ad6650b91c2494d1a)

diff --git a/src/fileio.c b/src/fileio.c
index dbd9bd4ce551bc94e7c0eef63c540232aec6ca32..010c5ac0864a70b138c94ea9210824cea7810200 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3903,8 +3903,15 @@ union read_non_regular
 {
   struct
   {
+    /* File descriptor to read from.  */
     emacs_fd fd;
+
+    /* If BUF is non-null, read into BUF; otherwise, read into
+       gap + INSERTED (done this way because the gap can relocate).  */
     char *buf;
+    ptrdiff_t inserted;
+
+    /* Number of bytes to try to read.  */
     ptrdiff_t bufsize;
   } s;
   GCALIGNED_UNION_MEMBER
@@ -3915,7 +3922,12 @@ static Lisp_Object
 read_non_regular (Lisp_Object state)
 {
   union read_non_regular *data = XFIXNUMPTR (state);
-  intmax_t nbytes = emacs_fd_read (data->s.fd, data->s.buf, data->s.bufsize);
+  intmax_t nbytes
+    = emacs_fd_read (data->s.fd,
+                    (data->s.buf ? data->s.buf
+                     : ((char *) BEG_ADDR + PT_BYTE - BEG_BYTE
+                        + data->s.inserted)),
+                    data->s.bufsize);
   return make_int (nbytes < 0 ? -errno : nbytes);
 }
 
@@ -4893,7 +4905,8 @@ by calling `format-decode', which see.  */)
            /* Read from the file, capturing `quit'.  When an
               error occurs, end the loop, and arrange for a quit
               to be signaled after decoding the text we read.  */
-           union read_non_regular data = {{fd, buf, bufsize}};
+           union read_non_regular data
+             = {{fd, buf == read_buf ? buf : NULL, inserted, bufsize}};
            nbytes = internal_condition_case_1
              (read_non_regular, make_pointer_integer (&data),
               Qerror, read_non_regular_quit);