mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-05-16 03:14:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

graphics-hook: Fix null pointer dereference

Browse Source 
Multiple APIs may be set up to capture without being initialized in
graphics-hook when multiple threads are sending present calls. This just
prevents those invalid captures from completing.
This commit is contained in:
Charlese2
2024-10-21 09:44:52 -06:00
committed by Ryan Foster
parent bf00c17b2b
commit 0b87f533b2
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,7 +333,7 @@ void d3d10_capture(void *swap_ptr, void *backbuffer_ptr)
if (capture_should_init()) {
d3d10_init(swap);
}
if (capture_ready()) {
if (data.handle != nullptr && capture_ready()) {
ID3D10Resource *backbuffer;
hr = dxgi_backbuffer->QueryInterface(__uuidof(ID3D10Resource), (void **)&backbuffer);

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

@@ -301,7 +301,7 @@ void d3d11_capture(void *swap_ptr, void *backbuffer_ptr)
if (capture_should_init()) {
d3d11_init(swap);
}
if (capture_ready()) {
if (data.handle != nullptr && capture_ready()) {
ID3D11Resource *backbuffer;
hr = dxgi_backbuffer->QueryInterface(__uuidof(ID3D11Resource), (void **)&backbuffer);

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

@@ -315,7 +315,7 @@ void d3d12_capture(void *swap_ptr, void *)
if (capture_should_init()) {
d3d12_init(swap);
}
if (capture_ready()) {
if (data.handle != nullptr && capture_ready()) {
d3d12_shtex_capture(swap);
}
}

2
plugins/win-capture/graphics-hook/d3d9-capture.cpp
View File

@@ -543,7 +543,7 @@ static void d3d9_capture(IDirect3DDevice9 *device, IDirect3DSurface9 *backbuffer
if (capture_should_init()) {
d3d9_init(device);
}
if (capture_ready()) {
if (data.handle != nullptr && capture_ready()) {
if (data.device != device) {
d3d9_free();
return;

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 4
#define HOOK_VER_PATCH 5
#ifndef STRINGIFY
#define STRINGIFY(s) #s