Fix crash in "AddressLookupTable" destructor due to invalid cast

crosire · Jul 14, 2017 · 970135f · 970135f
1 parent 0d3ec0a
commit 970135f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/source/d3d8to9.hpp b/source/d3d8to9.hpp
@@ -180,7 +180,7 @@ class Direct3DDevice8 : public IUnknown
 	DWORD CurrentVertexShaderHandle = 0, CurrentPixelShaderHandle = 0;
 };
 
-class Direct3DSwapChain8 : public IUnknown, private AddressLookupTableObject
+class Direct3DSwapChain8 : public IUnknown, public AddressLookupTableObject
 {
 	Direct3DSwapChain8(const Direct3DSwapChain8 &) = delete;
 	Direct3DSwapChain8 &operator=(const Direct3DSwapChain8 &) = delete;
@@ -223,7 +223,7 @@ class Direct3DBaseTexture8 : public Direct3DResource8
 	virtual DWORD STDMETHODCALLTYPE GetLOD() = 0;
 	virtual DWORD STDMETHODCALLTYPE GetLevelCount() = 0;
 };
-class Direct3DTexture8 : public Direct3DBaseTexture8, private AddressLookupTableObject
+class Direct3DTexture8 : public Direct3DBaseTexture8, public AddressLookupTableObject
 {
 	Direct3DTexture8(const Direct3DTexture8 &) = delete;
 	Direct3DTexture8 &operator=(const Direct3DTexture8 &) = delete;
@@ -261,7 +261,7 @@ class Direct3DTexture8 : public Direct3DBaseTexture8, private AddressLookupTable
 	Direct3DDevice8 *const Device;
 	IDirect3DTexture9 *const ProxyInterface;
 };
-class Direct3DCubeTexture8 : public Direct3DBaseTexture8, private AddressLookupTableObject
+class Direct3DCubeTexture8 : public Direct3DBaseTexture8, public AddressLookupTableObject
 {
 	Direct3DCubeTexture8(const Direct3DCubeTexture8 &) = delete;
 	Direct3DCubeTexture8 &operator=(const Direct3DCubeTexture8 &) = delete;
@@ -299,7 +299,7 @@ class Direct3DCubeTexture8 : public Direct3DBaseTexture8, private AddressLookupT
 	Direct3DDevice8 *const Device;
 	IDirect3DCubeTexture9 *const ProxyInterface;
 };
-class Direct3DVolumeTexture8 : public Direct3DBaseTexture8, private AddressLookupTableObject
+class Direct3DVolumeTexture8 : public Direct3DBaseTexture8, public AddressLookupTableObject
 {
 	Direct3DVolumeTexture8(const Direct3DVolumeTexture8 &) = delete;
 	Direct3DVolumeTexture8 &operator=(const Direct3DVolumeTexture8 &) = delete;
@@ -338,7 +338,7 @@ class Direct3DVolumeTexture8 : public Direct3DBaseTexture8, private AddressLooku
 	IDirect3DVolumeTexture9 *const ProxyInterface;
 };
 
-class Direct3DSurface8 : public IUnknown, private AddressLookupTableObject
+class Direct3DSurface8 : public IUnknown, public AddressLookupTableObject
 {
 	Direct3DSurface8(const Direct3DSurface8 &) = delete;
 	Direct3DSurface8 &operator=(const Direct3DSurface8 &) = delete;
@@ -367,7 +367,7 @@ class Direct3DSurface8 : public IUnknown, private AddressLookupTableObject
 	IDirect3DSurface9 *const ProxyInterface;
 };
 
-class Direct3DVolume8 : public IUnknown, private AddressLookupTableObject
+class Direct3DVolume8 : public IUnknown, public AddressLookupTableObject
 {
 	Direct3DVolume8(const Direct3DVolume8 &) = delete;
 	Direct3DVolume8 &operator=(const Direct3DVolume8 &) = delete;
@@ -396,7 +396,7 @@ class Direct3DVolume8 : public IUnknown, private AddressLookupTableObject
 	IDirect3DVolume9 *const ProxyInterface;
 };
 
-class Direct3DVertexBuffer8 : public Direct3DResource8, private AddressLookupTableObject
+class Direct3DVertexBuffer8 : public Direct3DResource8, public AddressLookupTableObject
 {
 	Direct3DVertexBuffer8(const Direct3DVertexBuffer8 &) = delete;
 	Direct3DVertexBuffer8 &operator=(const Direct3DVertexBuffer8 &) = delete;
@@ -429,7 +429,7 @@ class Direct3DVertexBuffer8 : public Direct3DResource8, private AddressLookupTab
 	IDirect3DVertexBuffer9 *const ProxyInterface;
 };
 
-class Direct3DIndexBuffer8 : public Direct3DResource8, private AddressLookupTableObject
+class Direct3DIndexBuffer8 : public Direct3DResource8, public AddressLookupTableObject
 {
 	Direct3DIndexBuffer8(const Direct3DIndexBuffer8 &) = delete;
 	Direct3DIndexBuffer8 &operator=(const Direct3DIndexBuffer8 &) = delete;

diff --git a/source/lookup_table.cpp b/source/lookup_table.cpp
@@ -19,7 +19,7 @@ AddressLookupTable::~AddressLookupTable()
 		{
 			assert(AddressCache[i].back().Address8 != nullptr);
 
-			static_cast<AddressLookupTableObject *>(AddressCache[i].back().Address8)->DeleteMe(false);
+			AddressCache[i].back().Address8->DeleteMe(false);
 
 			AddressCache[i].pop_back();
 		}

diff --git a/source/lookup_table.hpp b/source/lookup_table.hpp
@@ -12,7 +12,7 @@ class AddressLookupTable
 {
 	struct AddressStruct
 	{
-		void *Address8 = nullptr;
+		class AddressLookupTableObject *Address8 = nullptr;
 		void *Address9 = nullptr;
 	};