backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[d3d11] Fixed potential crashes in InitImage/InitBuffer

Browse Source
This commit is contained in:
Philip Rebohle 2018-03-03 23:33:55 +01:00
parent 52f6ba1756
commit e8e5739978
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d3d11/d3d11_device.cpp
View File

@ -1562,7 +1562,7 @@ namespace dxvk {
const DxvkBufferSlice bufferSlice const DxvkBufferSlice bufferSlice
= pBuffer->GetBufferSlice(); = pBuffer->GetBufferSlice();
if (pInitialData != nullptr) { if (pInitialData != nullptr && pInitialData->pSysMem != nullptr) {
LockResourceInitContext(); LockResourceInitContext();
m_resourceInitContext->updateBuffer( m_resourceInitContext->updateBuffer(
@ -1581,7 +1581,7 @@ namespace dxvk {
const D3D11_SUBRESOURCE_DATA* pInitialData) { const D3D11_SUBRESOURCE_DATA* pInitialData) {
const DxvkFormatInfo* formatInfo = imageFormatInfo(image->info().format); const DxvkFormatInfo* formatInfo = imageFormatInfo(image->info().format);
if (pInitialData != nullptr) { if (pInitialData != nullptr && pInitialData->pSysMem != nullptr) {
LockResourceInitContext(); LockResourceInitContext();
// pInitialData is an array that stores an entry for // pInitialData is an array that stores an entry for