From 27a8812b4e554c54cd102b785b003234893456ee Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 15 Sep 2018 15:03:50 -0700 Subject: Fixed one more gcc warning --- Graphics/GraphicsEngineOpenGL/src/ShaderGLImpl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Graphics/GraphicsEngineOpenGL') diff --git a/Graphics/GraphicsEngineOpenGL/src/ShaderGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/ShaderGLImpl.cpp index bb190b49..5052e984 100644 --- a/Graphics/GraphicsEngineOpenGL/src/ShaderGLImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/ShaderGLImpl.cpp @@ -96,7 +96,8 @@ ShaderGLImpl::ShaderGLImpl(IReferenceCounters *pRefCounters, RenderDeviceGLImpl // infoLogLen accounts for null terminator auto *pOutputDataBlob = MakeNewRCObj()(infoLogLen + FullSource.length() + 1); char* DataPtr = reinterpret_cast(pOutputDataBlob->GetDataPtr()); - memcpy(DataPtr, !infoLog.empty() ? infoLog.data() : nullptr, infoLogLen); + if (infoLogLen > 0) + memcpy(DataPtr, infoLog.data(), infoLogLen); memcpy(DataPtr + infoLogLen, FullSource.data(), FullSource.length() + 1); pOutputDataBlob->QueryInterface(IID_DataBlob, reinterpret_cast(CreationAttribs.ppCompilerOutput)); } -- cgit v1.2.3