mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-05-11 08:46:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

win-capture: Avoid NULL deref when capture not initialized

Browse Source
This commit is contained in:
confusionattack
2024-10-09 11:43:07 -04:00
committed by Lain
parent b5f4958eac
commit 4652daf748
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/win-capture/graphics-hook/d3d10-capture.cpp
View File

@@ -279,7 +279,9 @@ static inline void d3d10_copy_texture(ID3D10Resource *dst, ID3D10Resource *src)
static inline void d3d10_shtex_capture(ID3D10Resource *backbuffer)
{
d3d10_copy_texture(data.texture, backbuffer);
if (data.texture) {
d3d10_copy_texture(data.texture, backbuffer);
}
}
static void d3d10_shmem_capture_copy(int i)

4
plugins/win-capture/graphics-hook/d3d11-capture.cpp
View File

@@ -247,7 +247,9 @@ static inline void d3d11_copy_texture(ID3D11Resource *dst, ID3D11Resource *src)
static inline void d3d11_shtex_capture(ID3D11Resource *backbuffer)
{
d3d11_copy_texture(data.texture, backbuffer);
if (data.texture) {
d3d11_copy_texture(data.texture, backbuffer);
}
}
static void d3d11_shmem_capture_copy(int i)

4
plugins/win-capture/graphics-hook/d3d12-capture.cpp
View File

@@ -271,6 +271,10 @@ static inline void d3d12_copy_texture(ID3D11Resource *dst, ID3D11Resource *src)
static inline void d3d12_shtex_capture(IDXGISwapChain *swap)
{
if (!data.device11on12) {
return;
}
bool dxgi_1_4 = data.dxgi_1_4;
UINT cur_idx;

2
shared/obs-hook-config/graphics-hook-ver.h
View File

@@ -13,7 +13,7 @@
#define HOOK_VER_MAJOR 1
#define HOOK_VER_MINOR 8
#define HOOK_VER_PATCH 5
#define HOOK_VER_PATCH 6
#ifndef STRINGIFY
#define STRINGIFY(s) #s