Merge from gettext 0.15: Be more careful to use 'volatile'.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 006cb28..dd63881 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-09  Bruno Haible  <bruno@clisp.org>
+
+       * fatal-signal.c: Don't include string.h.
+       (at_fatal_signal): Use a copying loop instead of memcpy.
+
 2005-12-04  Bruno Haible  <bruno@clisp.org>
 
        * csharpexec.c: Add support for 'clix' launcher (untested).

diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
index 307cab4..1c396e0 100644 (file)
--- a/lib/fatal-signal.c
+++ b/lib/fatal-signal.c
@@ -27,7 +27,6 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <signal.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "xalloc.h"
@@ -201,12 +200,17 @@ at_fatal_signal (action_t action)
         because then the cleanup() function could access an already
         deallocated array.  */
       actions_entry_t *old_actions = actions;
+      size_t old_actions_allocated = actions_allocated;
       size_t new_actions_allocated = 2 * actions_allocated;
       actions_entry_t *new_actions =
        xmalloc (new_actions_allocated * sizeof (actions_entry_t));
+      size_t k;
 
-      memcpy (new_actions, old_actions,
-             actions_allocated * sizeof (actions_entry_t));
+      /* Don't use memcpy() here, because memcpy takes non-volatile arguments
+        and is therefore not guaranteed to complete all memory stores before
+        the next statement.  */
+      for (k = 0; k < old_actions_allocated; k++)
+       new_actions[k] = old_actions[k];
       actions = new_actions;
       actions_allocated = new_actions_allocated;
       /* Now we can free the old actions array.  */