chakrashim: ensure chakra_shim_native buffer is null terminated

PR-URL: #35 Reviewed-By: Jianchun Xu <Jianchun.Xu@microsoft.com>
nodejs · Mar 9, 2016 · 75ace7d · 75ace7d
1 parent adfadcc
commit 75ace7d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/deps/chakrashim/src/jsrtcontextshim.cc b/deps/chakrashim/src/jsrtcontextshim.cc
@@ -413,14 +413,18 @@ bool ContextShim::ExposeGc() {
 }
 
 bool ContextShim::ExecuteChakraShimJS() {
-  wchar_t buffer[_countof(chakra_shim_native)];
+  wchar_t buffer[_countof(chakra_shim_native) + 1];
 
-  if (StringConvert::CopyRaw<char, wchar_t>(chakra_shim_native,
+  if (StringConvert::CopyRaw<unsigned char, wchar_t>(chakra_shim_native,
       _countof(chakra_shim_native),
       buffer,
       _countof(chakra_shim_native)) != JsNoError) {
     return false;
   }
+
+  // Ensure the buffer is null terminated
+  buffer[_countof(chakra_shim_native)] = L'\0';
+
   JsValueRef getInitFunction;
   if (JsParseScript(buffer,
                     JS_SOURCE_CONTEXT_NONE,