diff options
| author | Ac_K <Acoustik666@gmail.com> | 2021-06-29 22:52:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-29 22:52:17 +0200 |
| commit | f4078ae2670bf98ce0e9e41359a3614ac802946f (patch) | |
| tree | 08ef2c74d56e3fb33b71d3978c99a58acae9ff68 | |
| parent | 00ce9eea620652b97b4d3e8cd9218c6fccff8b1c (diff) | |
aoc: Fix wrong check (#2427)
This PR fixes a wrong check added in #2414 which made Pokémon crash.
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Ns/Aoc/IAddOnContentManager.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Ns/Aoc/IAddOnContentManager.cs b/Ryujinx.HLE/HOS/Services/Ns/Aoc/IAddOnContentManager.cs index bdffbbc7..04a7a483 100644 --- a/Ryujinx.HLE/HOS/Services/Ns/Aoc/IAddOnContentManager.cs +++ b/Ryujinx.HLE/HOS/Services/Ns/Aoc/IAddOnContentManager.cs @@ -190,13 +190,14 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc // If QuestFlag is true, counts some extra titles. uint startIndex = context.RequestData.ReadUInt32(); - uint bufferSize = context.RequestData.ReadUInt32(); + uint counter = context.RequestData.ReadUInt32(); ulong bufferPosition = context.Request.ReceiveBuff[0].Position; + ulong bufferSize = context.Request.ReceiveBuff[0].Size; // TODO: This should use _addOnContentBaseId; uint aocCount = (uint)context.Device.System.ContentManager.GetAocCount(); - if (aocCount - startIndex > bufferSize) + if (counter > bufferSize / sizeof(uint)) { return ResultCode.InvalidBufferSize; } @@ -212,7 +213,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc GetAddOnContentBaseIdFromTitleId(context, titleId); - for (int i = 0; i < aocCount; i++) + for (int i = 0; i < aocCount - startIndex; i++) { context.Memory.Write(bufferPosition + (ulong)i * 4, (uint)(aocTitleIds[i + (int)startIndex] - _addOnContentBaseId)); } |