From 65a7cc62c0b5c2de57bcf575ba671ce779456a04 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 24 May 2016 23:28:15 +0200 Subject: [PATCH] Coverity: Fix some warnings from core.cpp/.h --- renderdoc/core/core.cpp | 8 ++++++-- renderdoc/core/core.h | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/renderdoc/core/core.cpp b/renderdoc/core/core.cpp index 5bac03cab..bc454dc70 100644 --- a/renderdoc/core/core.cpp +++ b/renderdoc/core/core.cpp @@ -43,11 +43,11 @@ bool is_exr_file(FILE *f) const uint32_t openexr_magic = MAKE_FOURCC(0x76, 0x2f, 0x31, 0x01); uint32_t magic = 0; - FileIO::fread(&magic, sizeof(magic), 1, f); + size_t bytesRead = FileIO::fread(&magic, sizeof(magic), 1, f); FileIO::fseek64(f, 0, SEEK_SET); - return magic == openexr_magic; + return bytesRead == sizeof(magic) && magic == openexr_magic; } template <> @@ -160,6 +160,9 @@ RenderDoc::RenderDoc() m_CapturesActive = 0; + m_RemoteIdent = 0; + m_RemoteThread = 0; + m_Replay = false; m_Cap = false; @@ -190,6 +193,7 @@ void RenderDoc::Initialise() Threading::Init(); m_RemoteIdent = 0; + m_RemoteThread = 0; if(!IsReplayApp()) { diff --git a/renderdoc/core/core.h b/renderdoc/core/core.h index f5dca4c69..10bc01253 100644 --- a/renderdoc/core/core.h +++ b/renderdoc/core/core.h @@ -392,7 +392,6 @@ private: static void RemoteAccessClientThread(void *s); ICrashHandler *m_ExHandler; - bool m_GLSLang; }; struct DriverRegistration