From 2efce905919d092afa037e658ccbcd5657206108 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 8 May 2018 12:47:28 +0100 Subject: [PATCH] [Coverity] Fix incorrect logic identified by deref-before-NULL-check --- qrenderdoc/Code/CaptureContext.cpp | 2 +- renderdoc/driver/vulkan/vk_serialise.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qrenderdoc/Code/CaptureContext.cpp b/qrenderdoc/Code/CaptureContext.cpp index 5ce621374..758aa3bcc 100644 --- a/qrenderdoc/Code/CaptureContext.cpp +++ b/qrenderdoc/Code/CaptureContext.cpp @@ -969,7 +969,7 @@ void CaptureContext::ExportCapture(const CaptureFileFormat &fmt, const rdcstr &e if(status != ReplayStatus::Succeeded) { QString text = tr("Couldn't open file '%1' for export\n").arg(filename); - QString message = local->ErrorString(); + QString message = file->ErrorString(); if(message.isEmpty()) text += tr("%1").arg(ToQStr(status)); else diff --git a/renderdoc/driver/vulkan/vk_serialise.cpp b/renderdoc/driver/vulkan/vk_serialise.cpp index 5359ff623..2041a5ef2 100644 --- a/renderdoc/driver/vulkan/vk_serialise.cpp +++ b/renderdoc/driver/vulkan/vk_serialise.cpp @@ -87,7 +87,7 @@ void DoSerialiseViaResourceId(SerialiserType &ser, type &el) DoSerialise(ser, id); - if(ser.IsReading() && !IsStructuredExporting(rm->GetState())) + if(ser.IsReading() && rm && !IsStructuredExporting(rm->GetState())) { el = VK_NULL_HANDLE;