N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add missing check for BRX, do not add a out of bounds block to the queue

Browse source
This commit is contained in:
gdk 2019-11-14 15:29:32 -03:00 committed by Thog
parent 6e399061ce
commit eea73bc421
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Ryujinx.Graphics.Shader/Decoders/Decoder.cs
View file

@ -45,6 +45,8 @@ namespace Ryujinx.Graphics.Shader.Decoders
GetBlock(0); GetBlock(0);
ulong maxAddress = (ulong)code.Length - headerSize;
while (workQueue.TryDequeue(out Block currBlock)) while (workQueue.TryDequeue(out Block currBlock))
{ {
// Check if the current block is inside another block. // Check if the current block is inside another block.
@ -65,7 +67,7 @@ namespace Ryujinx.Graphics.Shader.Decoders
} }
// If we have a block after the current one, set the limit address. // If we have a block after the current one, set the limit address.
ulong limitAddress = (ulong)code.Length - headerSize; ulong limitAddress = maxAddress;
if (nBlkIndex != blocks.Count) if (nBlkIndex != blocks.Count)
{ {
@ -140,7 +142,7 @@ namespace Ryujinx.Graphics.Shader.Decoders
} }
// Do we have a block after the current one? // Do we have a block after the current one?
if (!IsExit(currBlock.GetLastOp()) && currBlock.BrIndir != null) if (!IsExit(currBlock.GetLastOp()) && currBlock.BrIndir != null && currBlock.EndAddress < maxAddress)
{ {
bool targetVisited = visited.ContainsKey(currBlock.EndAddress); bool targetVisited = visited.ContainsKey(currBlock.EndAddress);