From f41687f4c1948e9e111afd70e979e98ea5de52fa Mon Sep 17 00:00:00 2001 From: Mary Date: Mon, 1 Nov 2021 23:38:13 +0100 Subject: hle: Make Ryujinx.HLE project entirely safe (#2789) * Remove a bit of unsafety around * Regenerate StructArrayHelpers with a max element value of 256 * hle: remove unsafe marker from all struct that had it * hle: make SoftwareKeyboardRenderer.TryCopyTo safe * hle: remove unsafety in NpadDevice and remove AllowUnsafeBlocks from csproj * Revert "Regenerate StructArrayHelpers with a max element value of 256" This reverts commit f32a6e5be094f50571970eb1116b65c080781d05. * Introduce ByteArray of various size and use that instead of ArrayXXX to avoid stackoverflow in .NET runtime type resolution * Use ByteArray more * Add some missing spaces on Pack = 1 for various structs * Fix broken logic for TryCopyTo * Address gdkchan's comment * Address gdkchan's comment --- Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs') diff --git a/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs b/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs index 4097eddf..7a91ce1e 100644 --- a/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs @@ -59,23 +59,23 @@ namespace Ryujinx.HLE.HOS.Services.Ro { return ResultCode.InvalidNrr; } - else if (header.NrrSize != nrrSize) + else if (header.Size != nrrSize) { return ResultCode.InvalidSize; } List hashes = new List(); - for (int i = 0; i < header.HashCount; i++) + for (int i = 0; i < header.HashesCount; i++) { - byte[] temp = new byte[0x20]; + byte[] hash = new byte[0x20]; - _owner.CpuMemory.Read(nrrAddress + header.HashOffset + (uint)(i * 0x20), temp); + _owner.CpuMemory.Read(nrrAddress + header.HashesOffset + (uint)(i * 0x20), hash); - hashes.Add(temp); + hashes.Add(hash); } - nrrInfo = new NrrInfo((ulong)nrrAddress, header, hashes); + nrrInfo = new NrrInfo(nrrAddress, header, hashes); return ResultCode.Success; } -- cgit v1.2.3