Jayden/sharpemu
1
0
Fork 0
mirror of https://github.com/par274/sharpemu.git synced 2026-08-07 10:29:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

[videoout] guard degenerate guest buffer ranges (#755)

Browse Source
This commit is contained in:
Berk
2026-08-03 10:09:07 +03:00
committed by GitHub
parent 8eb2c1e9cb
commit 26bda041fa
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SharpEmu.Libs/VideoOut/VulkanVideoPresenter.cs
+12 -2
View File
@@ -10179,7 +10179,12 @@ internal static unsafe class VulkanVideoPresenter
} }
var size = (ulong)Math.Max(guestBuffer.Length, sizeof(uint)); var size = (ulong)Math.Max(guestBuffer.Length, sizeof(uint));
var endAddress = checked(guestBuffer.BaseAddress + size); if (guestBuffer.BaseAddress > ulong.MaxValue - size)
{
return CreateTransientGlobalBufferResource(guestBuffer);
}
var endAddress = guestBuffer.BaseAddress + size;
GuestBufferAllocation? allocation = null; GuestBufferAllocation? allocation = null;
foreach (var candidate in _guestBufferAllocations) foreach (var candidate in _guestBufferAllocations)
{ {
@@ -10414,9 +10419,14 @@ internal static unsafe class VulkanVideoPresenter
} }
var size = (ulong)Math.Max(buffer.Length, sizeof(uint)); var size = (ulong)Math.Max(buffer.Length, sizeof(uint));
if (buffer.BaseAddress > ulong.MaxValue - size - 3)
{
continue;
}
var alignedStart = buffer.BaseAddress & var alignedStart = buffer.BaseAddress &
~(GuestStorageBufferOffsetAlignment - 1); ~(GuestStorageBufferOffsetAlignment - 1);
var paddedEnd = checked(buffer.BaseAddress + size + 3) & ~3UL; var paddedEnd = (buffer.BaseAddress + size + 3) & ~3UL;
ranges.Add(( ranges.Add((
alignedStart, alignedStart,
paddedEnd)); paddedEnd));