Merge pull request #106052 from uno1982/correct-get_unique_id-windows-null-termination

Fix Windows `OS.get_unique_id()` null termination issue
This commit is contained in:
Thaddeus Crews
2025-05-26 11:24:37 -05:00

View File

@@ -2437,7 +2437,9 @@ String OS_Windows::get_user_data_dir(const String &p_user_dir) const {
String OS_Windows::get_unique_id() const { String OS_Windows::get_unique_id() const {
HW_PROFILE_INFOA HwProfInfo; HW_PROFILE_INFOA HwProfInfo;
ERR_FAIL_COND_V(!GetCurrentHwProfileA(&HwProfInfo), ""); ERR_FAIL_COND_V(!GetCurrentHwProfileA(&HwProfInfo), "");
return String::ascii(Span((HwProfInfo.szHwProfileGuid), HW_PROFILE_GUIDLEN));
// Note: Windows API returns a GUID with null termination.
return String::ascii(Span<char>(HwProfInfo.szHwProfileGuid, strnlen(HwProfInfo.szHwProfileGuid, HW_PROFILE_GUIDLEN)));
} }
bool OS_Windows::_check_internal_feature_support(const String &p_feature) { bool OS_Windows::_check_internal_feature_support(const String &p_feature) {