summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/environ.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 07d34ee9c..fcfb7c703 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
2005-04-26 Christopher Faylor <cgf@timesys.com>
+ * environ.cc (build_env): Ensure that win32 array is properly filled in
+ when a missing value has to be generated.
+
+2005-04-26 Christopher Faylor <cgf@timesys.com>
+
* include/cygwin/version.h: Bump DLL minor number to 17.
2005-04-24 Pavel Tsekov <ptsekov@gmx.net>
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index 18fa433f1..75c1a8139 100644
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -980,7 +980,7 @@ build_env (const char * const *envp, char *&envblock, int &envc,
*dstp = spenvs[i].retrieve (no_envblock);
if (*dstp && (!no_envblock || spenvs[i].force) && *dstp != env_dontadd)
{
- *pass_dstp = *dstp;
+ *pass_dstp++ = *dstp;
tl += strlen (*dstp) + 1;
dstp++;
}