From 457a6735067f39b48676e14c728af118dee3ef5c Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 26 Oct 2018 13:42:16 -0700 Subject: [PATCH] Windows: avoid environment variables with empty name --- racket/src/rktio/rktio_envvars.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/racket/src/rktio/rktio_envvars.c b/racket/src/rktio/rktio_envvars.c index 9991dce624..07ace4ab34 100644 --- a/racket/src/rktio/rktio_envvars.c +++ b/racket/src/rktio/rktio_envvars.c @@ -167,7 +167,8 @@ rktio_envvars_t *rktio_envvars(rktio_t *rktio) count = 0; i = 0; while (e[i]) { - count++; + if (e[i] != '=') + count++; while (e[i]) i++; i++; } @@ -187,11 +188,13 @@ rktio_envvars_t *rktio_envvars(rktio_t *rktio) for (j = 0; p[j] && p[j] != '='; j++) { } p[j] = 0; - envvars->names[count] = MSC_IZE(strdup)(p); - envvars->vals[count] = MSC_IZE(strdup)(p+j+1); + if (p[0] != 0) { + envvars->names[count] = MSC_IZE(strdup)(p); + envvars->vals[count] = MSC_IZE(strdup)(p+j+1); + count++; + } free(p); i++; - count++; } FreeEnvironmentStringsW(e);