Mercurial > hg > octave-lojdl > gnulib-hg
changeset 7014:43bb3848f1c7
Merge from gettext 0.15: Be more careful to use 'volatile'.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 22 Jul 2006 14:44:27 +0000 |
| parents | 7207ca9391ca |
| children | a84d5045e247 |
| files | lib/ChangeLog lib/fatal-signal.c |
| diffstat | 2 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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).
--- 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 @@ 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. */