From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 14 Nov 2008 21:11:15 +0000 (+0000)
Subject: (Finsert_file_contents): Decrement specpdl_ptr to avoid double file
X-Git-Tag: emacs-pretest-23.0.90~1834
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db65a627b0c9ac4fa48f84693c579eca79881b11;p=emacs.git

(Finsert_file_contents): Decrement specpdl_ptr to avoid double file
close.
---

diff --git a/src/fileio.c b/src/fileio.c
index cd68f4eb911..998dc974c47 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3144,6 +3144,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
   int read_quit = 0;
   Lisp_Object old_Vdeactivate_mark = Vdeactivate_mark;
   int we_locked_file = 0;
+  int deferred_remove_unwind_protect = 0;
 
   if (current_buffer->base_buffer && ! NILP (visit))
     error ("Cannot do file visiting in an indirect buffer");
@@ -3656,6 +3657,11 @@ variable `last-coding-system-used' to the coding system actually used.  */)
       UNGCPRO;
       emacs_close (fd);
 
+      /* We should remove the unwind_protect calling
+	 close_file_unwind, but other stuff has been added the stack,
+	 so defer the removal till we reach the `handled' label.  */
+      deferred_remove_unwind_protect = 1;
+
       /* At this point, HOW_MUCH should equal TOTAL, or should be <= 0
 	 if we couldn't read the file.  */
 
@@ -4037,6 +4043,11 @@ variable `last-coding-system-used' to the coding system actually used.  */)
 
  handled:
 
+  if (deferred_remove_unwind_protect)
+    /* If requested above, discard the unwind protect for closing the
+       file.  */
+    specpdl_ptr--;
+
   if (!NILP (visit))
     {
       if (!EQ (current_buffer->undo_list, Qt) && !nochange)