* environ.cc (strbrk): Properly deal with environment variable sans quote.

2014-02-10 01:59:37 +00:00
parent 16be32590d
commit 423de1c03d
2 changed files with 7 additions and 2 deletions
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -148,10 +148,10 @@ strbrk(char *&buf)
  char *tok = buf;
  char *sep = buf + strcspn(buf, " \t");
  char *quotestart = strchr(buf, '"');
-  if (quotestart > sep)
+  if (!quotestart || quotestart > sep)
    {
+      buf = sep + !!*sep;	/* Don't point beyond EOS */
      quotestart = NULL;
-      buf = sep + 1;
    }
  else
    {