[gawk-diffs] [SCM] gawk branch, master, updated. gawk-4.1.0-86-gab66657

[Arnold Robbins]

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 "gawk".

The branch, master has been updated
       via  ab66657899e258693df8352643a0ac6e9d19bfdc (commit)
       via  84f6bcd255d10b593298e0408011e9f03d1ab18c (commit)
       via  7622c96e99921f28c032b742f169d9558df89355 (commit)
      from  445f13a1e5eff0b0f520118fd89db7fe0a7b0aa8 (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 -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=ab66657899e258693df8352643a0ac6e9d19bfdc

commit ab66657899e258693df8352643a0ac6e9d19bfdc
Merge: 7622c96 84f6bcd
Author: Arnold D. Robbins <address@hidden>
Date:   Thu Aug 22 21:52:57 2013 +0300

    Merge branch 'gawk-4.1-stable'


http://git.sv.gnu.org/cgit/gawk.git/commit/?id=7622c96e99921f28c032b742f169d9558df89355

commit 7622c96e99921f28c032b742f169d9558df89355
Author: Arnold D. Robbins <address@hidden>
Date:   Thu Aug 22 21:38:44 2013 +0300

    Bug fix for Mac OS X in passing environment through.

diff --git a/ChangeLog b/ChangeLog
index 5f6450b..c2315d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-22         Arnold D. Robbins     <address@hidden>
+
+       * str_array.c (env_store): If the new value being stored is NULL,
+       pass in "" instead. Avoids core dump on Mac OS X.
+       Thanks to Hermann Peifer for the bug report.
+
 2013-08-20         Arnold D. Robbins     <address@hidden>
 
        * nonposix.h: New file. Contains FAKE_FD_VALUE.
diff --git a/str_array.c b/str_array.c
index e4352a9..33c9ddc 100644
--- a/str_array.c
+++ b/str_array.c
@@ -792,10 +792,15 @@ static NODE **
 env_store(NODE *symbol, NODE *subs)
 {
        NODE **val = str_exists(symbol, subs);
+       const char *newval;
 
        assert(val != NULL);
 
-       (void) setenv(subs->stptr, (*val)->stptr, 1);
+       newval = (*val)->stptr;
+       if (newval == NULL)
+               newval = "";
+
+       (void) setenv(subs->stptr, newval, 1);
 
        return val;
 }

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

Summary of changes:
 ChangeLog             |    6 ++++++
 extension/ChangeLog   |   14 ++++++++++++++
 extension/gawkfts.c   |    2 +-
 extension/inplace.c   |    2 ++
 extension/readdir.c   |    3 +++
 extension/revtwoway.c |    3 +++
 extension/testext.c   |    4 ++++
 str_array.c           |    7 ++++++-
 8 files changed, 39 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
gawk