VERY experimental Nintendo Switch 2 emulator
C++
[hle] Fix crash on MK8D and SM3DW LDN (#4417)
lizzie4ce45b3b37d1
diff --git a/src/common/uuid.cpp b/src/common/uuid.cppindex 51fe0abaa5..4b992c5df8 100644--- a/src/common/uuid.cpp+++ b/src/common/uuid.cpp@@ -208,9 +208,9 @@ UUID UUID::MakeRandomRFC4122V4() {return uuid;}-UUID UUID::MakeRFC4122V5(std::span<u8, 20> sha1) {+UUID UUID::MakeRFC4122V5(std::span<u8, 16> sha1) {UUID uuid{};- std::memcpy(&uuid.uuid, sha1.data(), sizeof(UUID));+ std::memcpy(&uuid.uuid, sha1.data(), sha1.size());uuid.uuid[8] = 0x80 | (uuid.uuid[8] & 0x3F);uuid.uuid[6] = 0x50 | (uuid.uuid[6] & 0xF);return uuid;diff --git a/src/common/uuid.h b/src/common/uuid.hindex 3aa3212dd7..465b5be58d 100644--- a/src/common/uuid.h+++ b/src/common/uuid.h@@ -104,7 +104,7 @@ struct UUID {/// @returns A random UUID that is RFC 4122 Version 4 compliant.[[nodiscard]] static UUID MakeRandomRFC4122V4();- [[nodiscard]] static UUID MakeRFC4122V5(std::span<u8, 20> sha1);+ [[nodiscard]] static UUID MakeRFC4122V5(std::span<u8, 16> sha1);friend constexpr bool operator==(const UUID& lhs, const UUID& rhs) = default;};diff --git a/src/core/hle/service/am/service/application_functions.cpp b/src/core/hle/service/am/service/application_functions.cppindex 215d204098..90d292c4a2 100644--- a/src/core/hle/service/am/service/application_functions.cpp+++ b/src/core/hle/service/am/service/application_functions.cpp@@ -347,21 +347,22 @@ Result IApplicationFunctions::NotifyRunning(Out<bool> out_became_running) {Result IApplicationFunctions::GetPseudoDeviceId(Out<Common::UUID> out_pseudo_device_id) {LOG_WARNING(Service_AM, "(stubbed)");- R_UNLESS(out_pseudo_device_id, ResultUnknown);+ R_UNLESS(out_pseudo_device_id != nullptr, ResultUnknown);// This should be hashed with the device specific hash// for now this will doconst auto res = FileSys::PatchManager::GetMetadataFromBaseOrUpdate(system, m_applet->program_id);- u8 hash[EVP_MAX_MD_SIZE];+ R_UNLESS(res.first != nullptr, ResultUnknown);+ std::array<u8, EVP_MAX_MD_SIZE> hash;unsigned int hash_len = 0;auto const seed = res.first->raw.seed_for_pseudo_device_id;EVP_MD_CTX *ctx = EVP_MD_CTX_new();auto const algorithm = EVP_sha1();EVP_DigestInit_ex(ctx, algorithm, nullptr);EVP_DigestUpdate(ctx, &seed, sizeof(seed));- EVP_DigestFinal_ex(ctx, hash, &hash_len);+ EVP_DigestFinal_ex(ctx, hash.data(), &hash_len);EVP_MD_CTX_free(ctx);- *out_pseudo_device_id = Common::UUID::MakeRFC4122V5(std::span<u8, 20>{hash, std::size(hash)});+ *out_pseudo_device_id = Common::UUID::MakeRFC4122V5(std::span<u8, 16>{hash.begin(), hash.begin() + 16});R_SUCCEED();}