From a9002525abad03a8e5aab27daf2c2a0093fb47f6 Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Fri, 11 Sep 2020 19:50:58 -0700
Subject: Fixed shader error log + fixed tests in Win8.1

---
 Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Graphics/GraphicsEngineD3DBase')

diff --git a/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp b/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp
index d7ecad4b..053e3378 100644
--- a/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp
+++ b/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp
@@ -321,7 +321,8 @@ ShaderD3DBase::ShaderD3DBase(const ShaderCreateInfo& ShaderCI, const ShaderVersi
         {
             auto* pOutputDataBlob = MakeNewRCObj<DataBlobImpl>()(CompilerMsgLen + 1 + ShaderSource.length() + 1);
             char* DataPtr         = static_cast<char*>(pOutputDataBlob->GetDataPtr());
-            memcpy(DataPtr, CompilerMsg, CompilerMsgLen + 1);
+            memcpy(DataPtr, CompilerMsg, CompilerMsgLen);
+            DataPtr[CompilerMsgLen] = 0; // Set null terminator
             memcpy(DataPtr + CompilerMsgLen + 1, ShaderSource.data(), ShaderSource.length() + 1);
             pOutputDataBlob->QueryInterface(IID_DataBlob, reinterpret_cast<IObject**>(ShaderCI.ppCompilerOutput));
         }
-- 
cgit v1.2.3