emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Fix invalid audio renderer buffer size when end offset < start offset (#5588)

Browse source 
* Fix invalid audio renderer buffer size when end offset < start offset

* Fix possible overflow on IsSampleOffsetInRangeForPcm
This commit is contained in:
gdkchan 2023-08-20 03:56:30 -03:00 committed by GitHub
parent 3e5c211394
commit 7f96dbc024
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Ryujinx.Audio/Renderer/Dsp/PcmHelper.cs
View file

@ -20,6 +20,11 @@ namespace Ryujinx.Audio.Renderer.Dsp
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static int GetBufferSize<T>(int startSampleOffset, int endSampleOffset, int offset, int count) where T : unmanaged public static int GetBufferSize<T>(int startSampleOffset, int endSampleOffset, int offset, int count) where T : unmanaged
{ {
if (endSampleOffset < startSampleOffset)
{
return 0;
}
return GetCountToDecode(startSampleOffset, endSampleOffset, offset, count) * Unsafe.SizeOf<T>(); return GetCountToDecode(startSampleOffset, endSampleOffset, offset, count) * Unsafe.SizeOf<T>();
} }

4
src/Ryujinx.Audio/Renderer/Parameter/VoiceInParameter.cs
View file

@ -264,8 +264,8 @@ namespace Ryujinx.Audio.Renderer.Parameter
{ {
uint dataTypeSize = (uint)Unsafe.SizeOf<T>(); uint dataTypeSize = (uint)Unsafe.SizeOf<T>();
return StartSampleOffset * dataTypeSize <= Size && return (ulong)StartSampleOffset * dataTypeSize <= Size &&
EndSampleOffset * dataTypeSize <= Size; (ulong)EndSampleOffset * dataTypeSize <= Size;
} }
/// <summary> /// <summary>