[SCM] GNU M4 source repository branch, branch-1.4, updated. v1.4.15-6-g4da7e2c

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=4da7e2c52cf4478cd44889b8aaf6b1a404f47437

The branch, branch-1.4 has been updated
       via  4da7e2c52cf4478cd44889b8aaf6b1a404f47437 (commit)
      from  5e93c93b0480b9badd4365fab6a68772293d7949 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4da7e2c52cf4478cd44889b8aaf6b1a404f47437
Author: Eric Blake <address@hidden>
Date:   Fri Dec 31 12:53:53 2010 -0700

    main: avoid leaking string on Haiku
    
    On Haiku, SIGBUS == SIGSEGV, so we were overwriting a malloc'd
    string for a (minor) memory leak.
    
    * src/m4.c (main): Avoid leak when SIGBUS == SIGSEGV.
    * THANKS: Update.
    Reported by Scott McCreary.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    7 +++++++
 THANKS    |    1 +
 src/m4.c  |    2 +-
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dcefbe7..a175613 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-31  Eric Blake  <address@hidden>
+
+       main: avoid leaking string on Haiku
+       * src/m4.c (main): Avoid leak when SIGBUS == SIGSEGV.
+       * THANKS: Update.
+       Reported by Scott McCreary.
+
 2010-12-24  Eric Blake  <address@hidden>
 
        build: pull in various gnulib fixes
diff --git a/THANKS b/THANKS
index b0f0c19..e1c0295 100644
--- a/THANKS
+++ b/THANKS
@@ -108,6 +108,7 @@ Ronny Peine             address@hidden
 Sami Liedes             address@hidden
 Santiago Vila           address@hidden
 Scott Bartram           deneb!scottb
+Scott McCreary          address@hidden
 Sergey Poznyakoff       address@hidden
 Simon Leinen            address@hidden
 Skip Montanaro          address@hidden
diff --git a/src/m4.c b/src/m4.c
index 3905ba1..42dbf65 100644
--- a/src/m4.c
+++ b/src/m4.c
@@ -397,7 +397,7 @@ main (int argc, char *const *argv)
   signal_message[SIGABRT] = xstrdup (strsignal (SIGABRT));
   signal_message[SIGILL] = xstrdup (strsignal (SIGILL));
   signal_message[SIGFPE] = xstrdup (strsignal (SIGFPE));
-  if (SIGBUS != SIGILL)
+  if (SIGBUS != SIGILL && SIGBUS != SIGSEGV)
     signal_message[SIGBUS] = xstrdup (strsignal (SIGBUS));
   sigemptyset (&act.sa_mask);
   /* One-shot - if we fault while handling a fault, we want to revert


hooks/post-receive
-- 
GNU M4 source repository