From: Bruno Haible <bruno@clisp.org>
Date: Mon, 10 Apr 2006 16:11:39 +0000 (+0000)
Subject: Fix possible problem with missing 'volatile'.
X-Git-Tag: v0.15~239
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03d921982d9138decedf8d8db1ce574e0ef836e0;p=thirdparty%2Fgettext.git

Fix possible problem with missing 'volatile'.
---

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 4bec7c1d3..d9a64d6b3 100644
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/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.
+
 2006-04-05  Bruno Haible  <bruno@clisp.org>
 
 	* config.charset: Update Juan Manuel Guerrero's address.
diff --git a/gettext-tools/lib/fatal-signal.c b/gettext-tools/lib/fatal-signal.c
index 3f0729448..5e245982e 100644
--- a/gettext-tools/lib/fatal-signal.c
+++ b/gettext-tools/lib/fatal-signal.c
@@ -1,5 +1,5 @@
 /* Emergency actions in case of a fatal signal.
-   Copyright (C) 2003-2004 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,6 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <signal.h>
-#include <string.h>
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -203,12 +202,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.  */