thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix osPiStartDma() crash - force sound entries to stay in bounds

Browse source
This commit is contained in:
MysterD 2023-04-22 01:30:41 -07:00
parent ad104a1689
commit eb413b5777
2 changed files with 38 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/audio/heap.c
View file

@ -28,17 +28,17 @@ s8 gReverbDownsampleRate;
u8 sReverbDownsampleRateLog; // never read u8 sReverbDownsampleRateLog; // never read
#endif #endif
struct SoundAllocPool gAudioSessionPool = {}; struct SoundAllocPool gAudioSessionPool = { 0 };
struct SoundAllocPool gAudioInitPool = {}; struct SoundAllocPool gAudioInitPool = { 0 };
struct SoundAllocPool gNotesAndBuffersPool = {}; struct SoundAllocPool gNotesAndBuffersPool = { 0 };
u8 sAudioHeapPad[0x20]; // probably two unused pools u8 sAudioHeapPad[0x20]; // probably two unused pools
struct SoundAllocPool gSeqAndBankPool = {}; struct SoundAllocPool gSeqAndBankPool = { 0 };
struct SoundAllocPool gPersistentCommonPool = {}; struct SoundAllocPool gPersistentCommonPool = { 0 };
struct SoundAllocPool gTemporaryCommonPool = {}; struct SoundAllocPool gTemporaryCommonPool = { 0 };
struct SoundMultiPool gSeqLoadedPool = {}; struct SoundMultiPool gSeqLoadedPool = { 0 };
struct SoundMultiPool gBankLoadedPool = {}; struct SoundMultiPool gBankLoadedPool = { 0 };
struct SoundMultiPool gUnusedLoadedPool = {}; struct SoundMultiPool gUnusedLoadedPool = { 0 };
#ifdef VERSION_SH #ifdef VERSION_SH
struct Unk1Pool gUnkPool1; struct Unk1Pool gUnkPool1;
@ -396,32 +396,32 @@ void *alloc_bank_or_seq(struct SoundMultiPool *arg0, s32 arg1, s32 size, s32 arg
// arg3 = 0, 1 or 2? // arg3 = 0, 1 or 2?
#ifdef VERSION_SH #ifdef VERSION_SH
struct SoundMultiPool *arg0; struct SoundMultiPool *arg0 = NULL;
#define isSound poolIdx #define isSound poolIdx
#endif #endif
struct TemporaryPool *tp; struct TemporaryPool *tp = NULL;
struct SoundAllocPool *pool; struct SoundAllocPool *pool = NULL;
void *ret; void *ret = NULL;
#if defined(VERSION_JP) || defined(VERSION_US) #if defined(VERSION_JP) || defined(VERSION_US)
u16 UNUSED _firstVal; u16 UNUSED _firstVal = 0;
u16 UNUSED _secondVal; u16 UNUSED _secondVal = 0;
#else #else
u16 firstVal; u16 firstVal = 0;
u16 secondVal; u16 secondVal = 0;
#endif #endif
u32 nullID = -1; u32 nullID = -1;
UNUSED s32 i; UNUSED s32 i = 0;
u8 *table = NULL; u8 *table = NULL;
#ifndef VERSION_SH #ifndef VERSION_SH
u8 isSound; u8 isSound = 0;
#endif #endif
#if defined(VERSION_JP) || defined(VERSION_US) #if defined(VERSION_JP) || defined(VERSION_US)
u16 firstVal; u16 firstVal = 0;
u16 secondVal; u16 secondVal = 0;
u32 bothDiscardable; u32 bothDiscardable = 0;
u32 leftDiscardable, rightDiscardable; u32 leftDiscardable, rightDiscardable = 0;
u32 leftNotLoaded, rightNotLoaded; u32 leftNotLoaded, rightNotLoaded = 0;
u32 leftAvail, rightAvail; u32 leftAvail, rightAvail = 0;
#endif #endif
#ifdef VERSION_SH #ifdef VERSION_SH
@ -735,6 +735,12 @@ void *alloc_bank_or_seq(struct SoundMultiPool *arg0, s32 arg1, s32 size, s32 arg
return ret; return ret;
} }
// Force the numEntries to stay in bounds
if (arg0->persistent.numEntries >= 32) {
arg0->persistent.numEntries = 31;
}
#if defined(VERSION_EU) || defined(VERSION_SH) #if defined(VERSION_EU) || defined(VERSION_SH)
#ifdef VERSION_SH #ifdef VERSION_SH
ret = sound_alloc_uninitialized(&arg0->persistent.pool, size); ret = sound_alloc_uninitialized(&arg0->persistent.pool, size);
@ -778,7 +784,13 @@ void *alloc_bank_or_seq(struct SoundMultiPool *arg0, s32 arg1, s32 size, s32 arg
#if defined(VERSION_EU) || defined(VERSION_SH) #if defined(VERSION_EU) || defined(VERSION_SH)
return arg0->persistent.entries[arg0->persistent.numEntries++].ptr; return arg0->persistent.entries[arg0->persistent.numEntries++].ptr;
#else #else
arg0->persistent.numEntries++; return arg0->persistent.entries[arg0->persistent.numEntries - 1].ptr; arg0->persistent.numEntries++;
// Force the numEntries to stay in bounds
if (arg0->persistent.numEntries >= 32) {
arg0->persistent.numEntries = 31;
return arg0->persistent.entries[arg0->persistent.numEntries].ptr;
}
return arg0->persistent.entries[arg0->persistent.numEntries - 1].ptr;
#endif #endif
#ifdef VERSION_SH #ifdef VERSION_SH
#undef isSound #undef isSound

1
src/pc/djui/djui_unicode.c
View file

@ -203,7 +203,6 @@ void djui_unicode_init(void) {
assert(bytes >= 2 && bytes <= 4); assert(bytes >= 2 && bytes <= 4);
assert(key > 127); assert(key > 127);
hmap_put(sCharMap, key, glyph); hmap_put(sCharMap, key, glyph);
printf(">>> %llu\n", key);
} }
// add duplicate glyphs // add duplicate glyphs