lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-12-28 22:26:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10475 from ameerj/microprofile-workaround

Browse source 
microprofile: Avoid crashing due to OOB stackPos
This commit is contained in:
liamwhite 2023-05-28 13:18:54 -04:00 committed by GitHub
parent 381caf4c00 fee91096ca
commit b26018e2e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
externals/microprofile/microprofile.h vendored
View file

@ -1697,7 +1697,13 @@ void MicroProfileFlip()
{ {
int nTimer = MicroProfileLogTimerIndex(LE); int nTimer = MicroProfileLogTimerIndex(LE);
uint8_t nGroup = pTimerToGroup[nTimer]; uint8_t nGroup = pTimerToGroup[nTimer];
MP_ASSERT(nStackPos < MICROPROFILE_STACK_MAX);
// To avoid crashing due to OOB memory accesses/asserts
// simply skip this iteration
// MP_ASSERT(nStackPos < MICROPROFILE_STACK_MAX);
if (nStackPos >= MICROPROFILE_STACK_MAX) {
break;
}
MP_ASSERT(nGroup < MICROPROFILE_MAX_GROUPS); MP_ASSERT(nGroup < MICROPROFILE_MAX_GROUPS);
pGroupStackPos[nGroup]++; pGroupStackPos[nGroup]++;
pStack[nStackPos++] = k; pStack[nStackPos++] = k;