emu-mirrors/ryujinx-fork
0
0
Fork 0
mirror of https://github.com/ryujinx-mirror/ryujinx.git synced 2024-12-23 18:45:44 +00:00
Code Activity

aoc: Fix wrong check (#2427)

Browse source 
This PR fixes a wrong check added in #2414 which made Pokémon crash.
This commit is contained in:
Ac_K 2021-06-29 22:52:17 +02:00 committed by GitHub
parent 00ce9eea62
commit f4078ae267
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Ryujinx.HLE/HOS/Services/Ns/Aoc/IAddOnContentManager.cs
View file

@ -190,13 +190,14 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc
// If QuestFlag is true, counts some extra titles. // If QuestFlag is true, counts some extra titles.
uint startIndex = context.RequestData.ReadUInt32(); uint startIndex = context.RequestData.ReadUInt32();
uint bufferSize = context.RequestData.ReadUInt32(); uint counter = context.RequestData.ReadUInt32();
ulong bufferPosition = context.Request.ReceiveBuff[0].Position; ulong bufferPosition = context.Request.ReceiveBuff[0].Position;
ulong bufferSize = context.Request.ReceiveBuff[0].Size;
// TODO: This should use _addOnContentBaseId; // TODO: This should use _addOnContentBaseId;
uint aocCount = (uint)context.Device.System.ContentManager.GetAocCount(); uint aocCount = (uint)context.Device.System.ContentManager.GetAocCount();
if (aocCount - startIndex > bufferSize) if (counter > bufferSize / sizeof(uint))
{ {
return ResultCode.InvalidBufferSize; return ResultCode.InvalidBufferSize;
} }
@ -212,7 +213,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc
GetAddOnContentBaseIdFromTitleId(context, titleId); 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)); context.Memory.Write(bufferPosition + (ulong)i * 4, (uint)(aocTitleIds[i + (int)startIndex] - _addOnContentBaseId));
} }