From: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Wed, 11 Mar 2015 15:55:50 +0000 (-0700)
Subject: Fix BZ #18043 comment # 19: don't call undefined setenv(..., NULL, 1).
X-Git-Tag: upstream/2.30~6226
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a2d4cf72c0ab07d4e58b42c01ac3ed2b95ca8d9b;p=external%2Fglibc.git

Fix BZ #18043 comment # 19: don't call undefined setenv(..., NULL, 1).
---

diff --git a/ChangeLog b/ChangeLog
index 10410dc..7360079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-11  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	[BZ #18043]
+	* posix/wordexp.c (parse_param): Don't call setenv(..., NULL, 1).
+
 2015-03-11  Adhemerval Zanellla  <azanella@linux.vnet.ibm.com>
 
 	* config.h.in [HAVE_ASM_GLOBAL_DOT_NAME]: Remove define.
diff --git a/posix/wordexp.c b/posix/wordexp.c
index f470e08..f6062d5 100644
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -1915,7 +1915,7 @@ envsubst:
 	  if (pattern && !value)
 	    goto no_space;
 
-	  __setenv (env, value, 1);
+	  __setenv (env, value ?: "", 1);
 	  break;
 
 	default: