ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Protect against the data pointer being trashed by Release

This commit is contained in:
Luke Usher 2018-01-16 22:40:42 +00:00
parent 65b5e915a6
commit 8e3e374332
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -6022,11 +6022,13 @@ ULONG WINAPI XTL::EMUPATCH(D3DResource_Release)
typedef ULONG(__stdcall *XB_D3DResource_Release_t)(X_D3DResource*);
static XB_D3DResource_Release_t XB_D3DResource_Release = (XB_D3DResource_Release_t)GetXboxFunctionPointer("D3DResource_Release");
// Backup the data pointer, as it may get wiped out by this release call
DWORD data = pThis->Data;
ULONG uRet = XB_D3DResource_Release(pThis);
// If we freed the last resource, also release the host copy
if (uRet == 0) {
auto it = std::find(g_RegisteredResources.begin(), g_RegisteredResources.end(), pThis->Data);
auto it = std::find(g_RegisteredResources.begin(), g_RegisteredResources.end(), data);
if (it != g_RegisteredResources.end()) {
g_RegisteredResources.erase(it);
}