rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-06 04:46:17 +01:00
Code Issues Projects Releases Wiki Activity

[d3d9] Fix long driver/device names not being null terminated

Browse Source 
Signed-off-by: Joshua Ashton <joshua@froggi.es>
This commit is contained in:
Joshua Ashton 2021-10-22 02:58:53 +00:00
parent 409a6f5c3f
commit 8912c7adb0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/d3d9/d3d9_adapter.cpp
View File

@ -43,6 +43,12 @@ namespace dxvk {
m_adapter->logAdapterInfo(); m_adapter->logAdapterInfo();
} }
template <size_t N>
static void copyToStringArray(char (&dst)[N], const char* src) {
std::strncpy(dst, src, N);
dst[N - 1] = '\0';
}
HRESULT D3D9Adapter::GetAdapterIdentifier( HRESULT D3D9Adapter::GetAdapterIdentifier(
DWORD Flags, DWORD Flags,
@ -69,9 +75,9 @@ namespace dxvk {
const char* desc = options.customDeviceDesc.empty() ? props.deviceName : options.customDeviceDesc.c_str(); const char* desc = options.customDeviceDesc.empty() ? props.deviceName : options.customDeviceDesc.c_str();
const char* driver = GetDriverDLL(DxvkGpuVendor(vendorId)); const char* driver = GetDriverDLL(DxvkGpuVendor(vendorId));
std::strncpy(pIdentifier->Description, desc, std::size(pIdentifier->Description)); copyToStringArray(pIdentifier->Description, desc);
std::strncpy(pIdentifier->DeviceName, device.DeviceName, std::size(pIdentifier->DeviceName)); // The GDI device name. Not the actual device name. copyToStringArray(pIdentifier->DeviceName, device.DeviceName); // The GDI device name. Not the actual device name.
std::strncpy(pIdentifier->Driver, driver, std::size(pIdentifier->Driver)); // This is the driver's dll. copyToStringArray(pIdentifier->Driver, driver); // This is the driver's dll.
pIdentifier->DeviceIdentifier = guid; pIdentifier->DeviceIdentifier = guid;
pIdentifier->DeviceId = deviceId; pIdentifier->DeviceId = deviceId;