From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 28 Jul 2011 01:46:23 +0000 (-0700)
Subject: * callproc.c (Fcall_process): Use 'volatile' to avoid vfork clobbering.
X-Git-Tag: emacs-pretest-24.0.90~104^2~159^2~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5266b4bb6079efcf14e5d4fc633636a65c4b7e80;p=emacs.git

* callproc.c (Fcall_process): Use 'volatile' to avoid vfork clobbering.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 10f6e326891..2625c6f9aad 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* callproc.c (Fcall_process): Use 'volatile' to avoid vfork clobbering.
+
 2011-07-28  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Integer signedness and overflow and related fixes.  (Bug#9079)
diff --git a/src/callproc.c b/src/callproc.c
index ad3eddbdd39..f148f6233d4 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -603,6 +603,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
 
     /* vfork, and prevent local vars from being clobbered by the vfork.  */
     {
+      int volatile fd1_volatile = fd1;
       int volatile fd_error_volatile = fd_error;
       int volatile fd_output_volatile = fd_output;
       int volatile output_to_buffer_volatile = output_to_buffer;
@@ -610,6 +611,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
 
       pid = vfork ();
 
+      fd1 = fd1_volatile;
       fd_error = fd_error_volatile;
       fd_output = fd_output_volatile;
       output_to_buffer = output_to_buffer_volatile;