dahjah/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2026-04-12 03:11:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

LatteAddrLib: fix misaligned pointer UB in optimizedDecodeLoop_tm04

Browse Source 
- bpp=32: blockOutput is texelBaseType* (uint32_t, 4-byte aligned).
  Casting to uint64* and dereferencing is UB when the address is not
  8-byte aligned (e.g. 0x...c is 4-byte aligned but not 8-byte).
- bpp=8: blockOutput is texelBaseType* (uint8_t, 1-byte aligned).
  Casting to uint64* is UB for any address not divisible by 8.
This commit is contained in:
Fabio Arnold 2026-03-29 15:20:57 +02:00
parent d4857e8749
commit f26e716686
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Cafe/HW/Latte/LatteAddrLib/AddrLibFastDecode.h
View File

@ -149,21 +149,27 @@ void optimizedDecodeLoop_tm04_numSamples1_8x8_optimizedRowCopy(LatteTextureLoade
// bpp = 32
if (texelBaseTypeCount == 1)
{
uint64* blockOutput64 = (uint64*)blockOutput;
uint64* blockData64 = (uint64*)blockData;
if (isEncodeDirection)
{
blockData64[0] = blockOutput64[0];
blockData64[1] = blockOutput64[1];
blockData64[4] = blockOutput64[2];
blockData64[5] = blockOutput64[3];
blockData[0] = blockOutput[0];
blockData[1] = blockOutput[1];
blockData[2] = blockOutput[2];
blockData[3] = blockOutput[3];
blockData[8] = blockOutput[4];
blockData[9] = blockOutput[5];
blockData[10] = blockOutput[6];
blockData[11] = blockOutput[7];
}
else
{
blockOutput64[0] = blockData64[0];
blockOutput64[1] = blockData64[1];
blockOutput64[2] = blockData64[4];
blockOutput64[3] = blockData64[5];
blockOutput[0] = blockData[0];
blockOutput[1] = blockData[1];
blockOutput[2] = blockData[2];
blockOutput[3] = blockData[3];
blockOutput[4] = blockData[8];
blockOutput[5] = blockData[9];
blockOutput[6] = blockData[10];
blockOutput[7] = blockData[11];
}
blockOutput += 8;
}
@ -175,12 +181,10 @@ void optimizedDecodeLoop_tm04_numSamples1_8x8_optimizedRowCopy(LatteTextureLoade
// bpp = 8
if (texelBaseTypeCount == 1)
{
uint64* blockOutput64 = (uint64*)blockOutput;
uint64* blockData64 = (uint64*)blockData;
if (isEncodeDirection)
blockData64[0] = blockOutput64[0];
memcpy(blockData, blockOutput, 8);
else
blockOutput64[0] = blockData64[0];
memcpy(blockOutput, blockData, 8);
blockOutput += 8;
}
else