From f94ff7db4fe46881630af4b09b85ded842180516 Mon Sep 17 00:00:00 2001 From: Mikhail Paulyshka Date: Mon, 12 Mar 2018 01:54:03 +0300 Subject: [PATCH] [d3d11] add check for pResource against nullptr in D3D11ImmediateContext::Map() --- src/d3d11/d3d11_context_imm.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/d3d11/d3d11_context_imm.cpp b/src/d3d11/d3d11_context_imm.cpp index 1ba812f1e..1245fe074 100644 --- a/src/d3d11/d3d11_context_imm.cpp +++ b/src/d3d11/d3d11_context_imm.cpp @@ -89,6 +89,11 @@ namespace dxvk { D3D11_MAP MapType, UINT MapFlags, D3D11_MAPPED_SUBRESOURCE* pMappedResource) { + if (pResource == nullptr) { + Logger::warn("D3D11ImmediateContext::Map() application tried to map a nullptr resource"); + return DXGI_ERROR_INVALID_CALL; + } + D3D11_RESOURCE_DIMENSION resourceDim = D3D11_RESOURCE_DIMENSION_UNKNOWN; pResource->GetType(&resourceDim);