Fix potential crash in FindDevice()

elishacloud · Nov 21, 2024 · b53deaf · b53deaf
1 parent 5b24fa2
commit b53deaf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 7333 
+#define BUILD_NUMBER 7334 
diff --git a/ddraw/IDirect3DX.cpp b/ddraw/IDirect3DX.cpp
@@ -593,10 +593,14 @@ HRESULT m_IDirect3DX::FindDevice(LPD3DFINDDEVICESEARCH lpD3DFDS, LPD3DFINDDEVICE
 		if (CallbackContext.Found)
 		{
 			lpD3DFDR->guid = CallbackContext.DeviceDesc7.deviceGUID;
-			lpD3DFDR->ddHwDesc.dwSize = (lpD3DFDR->dwSize - sizeof(DWORD) - sizeof(GUID)) / 2;
-			ConvertDeviceDesc(lpD3DFDR->ddHwDesc, CallbackContext.DeviceDesc7);
-			lpD3DFDR->ddSwDesc.dwSize = (lpD3DFDR->dwSize - sizeof(DWORD) - sizeof(GUID)) / 2;
-			ConvertDeviceDesc(lpD3DFDR->ddSwDesc, CallbackContext.DeviceDesc7);
+			if (lpD3DFDR->ddHwDesc.dwSize)
+			{
+				ConvertDeviceDesc(lpD3DFDR->ddHwDesc, CallbackContext.DeviceDesc7);
+			}
+			if (lpD3DFDR->ddSwDesc.dwSize)
+			{
+				ConvertDeviceDesc(lpD3DFDR->ddSwDesc, CallbackContext.DeviceDesc7);
+			}
 
 			return D3D_OK;
 		}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define BUILD_NUMBER 7333
		#define BUILD_NUMBER 7334