From 58dea081c69b4c72cbd8ccd4ca1029e9d7d6c9d1 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 21 Jun 2017 15:52:51 -0600
Subject: [PATCH] fix memory-management bugs in rktio on Windows

---
 racket/src/rktio/rktio_convert.c | 20 ++++++++++----------
 racket/src/rktio/rktio_fs.c      |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/racket/src/rktio/rktio_convert.c b/racket/src/rktio/rktio_convert.c
index f64e0d3fbe..fd422e8458 100644
--- a/racket/src/rktio/rktio_convert.c
+++ b/racket/src/rktio/rktio_convert.c
@@ -344,31 +344,31 @@ char *rktio_system_language_country(rktio_t *rktio)
   /* Windows */
   LCID l;
   int llen, clen;
-  char *lang, *country, *s;
+  wchar_t *lang, *country, *s;
   l = GetUserDefaultLCID();
 
-  llen = GetLocaleInfo(l, LOCALE_SENGLANGUAGE, NULL, 0);
-  lang = malloc(llen);
+  llen = GetLocaleInfoW(l, LOCALE_SENGLANGUAGE, NULL, 0);
+  lang = malloc(llen * sizeof(wchar_t));
   GetLocaleInfo(l, LOCALE_SENGLANGUAGE, lang, llen);
   if (llen)
     llen -= 1; /* drop nul terminator */
 
-  clen = GetLocaleInfo(l, LOCALE_SENGCOUNTRY, NULL, 0);
-  country = malloc(clen);
-  GetLocaleInfo(l, LOCALE_SENGCOUNTRY, country, clen);
+  clen = GetLocaleInfoW(l, LOCALE_SENGCOUNTRY, NULL, 0);
+  country = malloc(clen * sizeof(wchar_t));
+  GetLocaleInfoW(l, LOCALE_SENGCOUNTRY, country, clen);
   if (clen)
     clen -= 1; /* drop nul terminator */
 
-  s = malloc(clen + llen + 2);
-  memcpy(s, lang, llen);
-  memcpy(s + 1 + llen, country, clen);
+  s = malloc((clen + llen + 2) * sizeof(wchar_t));
+  memcpy(s, lang, llen * sizeof(wchar_t));
+  memcpy(s + 1 + llen, country, clen * sizeof(wchar_t));
   s[llen] = '_';
   s[clen + llen + 1] = 0;
 
   free(lang);
   free(country);
   
-  return s;
+  return NARROW_PATH_copy_then_free(s);
 #else
   /* Unix */
   char *s;
diff --git a/racket/src/rktio/rktio_fs.c b/racket/src/rktio/rktio_fs.c
index 3795c8c69d..5409a5a359 100644
--- a/racket/src/rktio/rktio_fs.c
+++ b/racket/src/rktio/rktio_fs.c
@@ -365,7 +365,7 @@ static int UNC_stat(rktio_t *rktio, const char *dirname, int *flags, int *isdir,
 
   len = strlen(dirname);
 
-  copy = malloc(len+1);
+  copy = malloc(len+3); /* leave room to add `\.` */
   memcpy(copy, dirname, len+1);
 
   if (!rktio->windows_nt_or_later