lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-29 13:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Verify that DXGI optional pointers exist before wrapping. Refs #652

Browse Source 
* For example in ::GetFullscreenState() the target pointer itself can be
  NULL as well as the pointed-to-pointer being NULL.
This commit is contained in:
baldurk
2017-06-13 18:27:50 +01:00
parent d515c69a9f
commit f291be452f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/dxgi/dxgi_wrapped.cpp
+3 -3
View File
@@ -359,7 +359,7 @@ HRESULT STDMETHODCALLTYPE WrappedIDXGISwapChain4::GetContainingOutput(IDXGIOutpu
{
HRESULT ret = m_pReal->GetContainingOutput(ppOutput);
if(SUCCEEDED(ret) && *ppOutput)
if(SUCCEEDED(ret) && ppOutput && *ppOutput)
*ppOutput = (IDXGIOutput *)(new WrappedIDXGIOutput5(this, *ppOutput));
return ret;
@@ -408,7 +408,7 @@ HRESULT WrappedIDXGISwapChain4::GetFullscreenState(
{
HRESULT ret = m_pReal->GetFullscreenState(pFullscreen, ppTarget);
if(SUCCEEDED(ret) && *ppTarget)
if(SUCCEEDED(ret) && ppTarget && *ppTarget)
*ppTarget = (IDXGIOutput *)(new WrappedIDXGIOutput5(this, *ppTarget));
return ret;
@@ -554,7 +554,7 @@ HRESULT STDMETHODCALLTYPE WrappedIDXGISwapChain4::GetRestrictToOutput(IDXGIOutpu
{
HRESULT ret = m_pReal2->GetRestrictToOutput(ppRestrictToOutput);
if(SUCCEEDED(ret) && *ppRestrictToOutput)
if(SUCCEEDED(ret) && ppRestrictToOutput && *ppRestrictToOutput)
*ppRestrictToOutput = (IDXGIOutput *)(new WrappedIDXGIOutput5(this, *ppRestrictToOutput));
return ret;
renderdoc/driver/dxgi/dxgi_wrapped.h
+1 -1
View File
@@ -1056,7 +1056,7 @@ public:
{
HRESULT ret = m_pReal->EnumOutputs(Output, ppOutput);
if(SUCCEEDED(ret))
if(SUCCEEDED(ret) && ppOutput && *ppOutput)
*ppOutput = (IDXGIOutput *)(new WrappedIDXGIOutput5(this, *ppOutput));
return ret;