summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorameerj <52414509+ameerj@users.noreply.github.com>2023-05-28 04:10:54 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2023-05-28 04:24:22 +0200
commitfee91096ca71a7215a3d6e6b92cacc1227e23fd0 (patch)
tree628984dc23e2602b3d9093f49a8e7326dac3d937
parentMerge pull request #10414 from liamwhite/anv-push-descriptor (diff)
downloadyuzu-fee91096ca71a7215a3d6e6b92cacc1227e23fd0.tar
yuzu-fee91096ca71a7215a3d6e6b92cacc1227e23fd0.tar.gz
yuzu-fee91096ca71a7215a3d6e6b92cacc1227e23fd0.tar.bz2
yuzu-fee91096ca71a7215a3d6e6b92cacc1227e23fd0.tar.lz
yuzu-fee91096ca71a7215a3d6e6b92cacc1227e23fd0.tar.xz
yuzu-fee91096ca71a7215a3d6e6b92cacc1227e23fd0.tar.zst
yuzu-fee91096ca71a7215a3d6e6b92cacc1227e23fd0.zip
-rw-r--r--externals/microprofile/microprofile.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h
index 639f3618c..8f75a25aa 100644
--- a/externals/microprofile/microprofile.h
+++ b/externals/microprofile/microprofile.h
@@ -1697,7 +1697,13 @@ void MicroProfileFlip()
{
int nTimer = MicroProfileLogTimerIndex(LE);
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);
pGroupStackPos[nGroup]++;
pStack[nStackPos++] = k;