izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix a memory leak in bombers notebook (#377)

Browse Source 
* Cleanup notebook

* Remove commented struct members
This commit is contained in:
louist103
2024-05-22 09:05:05 -05:00
committed by Garrett Cox
parent 815552a2da
commit 44e4d2b362
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/src/code/z_play_hireso.c
+13 -3
View File
@@ -1070,8 +1070,8 @@ void BombersNotebook_Draw(BombersNotebook* this, GraphicsContext* gfxCtx) {
gfx = POLY_OPA_DISP;
if (this->loadState == BOMBERS_NOTEBOOK_LOAD_STATE_DONE) {
gSPSegment(gfx++, 0x07, this->scheduleDmaSegment);
gSPSegment(gfx++, 0x08, this->scheduleSegment);
//gSPSegment(gfx++, 0x07, this->scheduleDmaSegment);
//gSPSegment(gfx++, 0x08, this->scheduleSegment);
gfx = Gfx_SetupDL39(gfx);
gDPSetCombineLERP(gfx++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE,
ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
@@ -1115,6 +1115,9 @@ void BombersNotebook_Draw(BombersNotebook* this, GraphicsContext* gfxCtx) {
void BombersNotebook_LoadFiles(BombersNotebook* this, s32 flag) {
switch (this->loadState) {
case BOMBERS_NOTEBOOK_LOAD_STATE_NONE:
// #region 2S2H [Port] Same as the comment in the update function. We don't need to use the built in DMA
// engine. We use the resource manager.
#if 0
if (this->scheduleDmaSegment == NULL) {
break;
}
@@ -1122,6 +1125,7 @@ void BombersNotebook_LoadFiles(BombersNotebook* this, s32 flag) {
osCreateMesgQueue(&this->loadQueue, this->loadMsg, ARRAY_COUNT(this->loadMsg));
DmaMgr_SendRequestImpl(&this->dmaRequest, this->scheduleSegment, this->scheduleSegmentStart,
this->scheduleSegmentSize, 0, &this->loadQueue, OS_MESG_PTR(NULL));
#endif
this->loadState = BOMBERS_NOTEBOOK_LOAD_STATE_STARTED;
// fallthrough
case BOMBERS_NOTEBOOK_LOAD_STATE_STARTED:
@@ -1155,7 +1159,9 @@ void BombersNotebook_Update(PlayState* play, BombersNotebook* this, Input* input
s32 stickAdjY = input->rel.stick_y;
s32 cursorEntryScan;
// #region 2S2H [Port] We don't need to allocate anything because we don't use these segments.
// We also want to avoid using malloc here because using a size of zero still allocates some data.
#if 0
this->scheduleDmaSegmentStart = SEGMENT_ROM_START(schedule_dma_static_yar);
this->scheduleDmaSegmentSize = SEGMENT_ROM_SIZE(schedule_dma_static_syms);
this->scheduleSegmentStart = SEGMENT_ROM_START(schedule_static);
@@ -1168,6 +1174,7 @@ void BombersNotebook_Update(PlayState* play, BombersNotebook* this, Input* input
if (this->scheduleSegment == NULL) {
this->scheduleSegment = ZeldaArena_Malloc(this->scheduleSegmentSize);
}
#endif
BombersNotebook_LoadFiles(this, OS_MESG_NOBLOCK);
@@ -1348,9 +1355,12 @@ void BombersNotebook_Destroy(BombersNotebook* this) {
if (this->loadState == BOMBERS_NOTEBOOK_LOAD_STATE_STARTED) {
BombersNotebook_LoadFiles(this, OS_MESG_BLOCK);
}
#if 0
if (this->scheduleDmaSegment != NULL) {
ZeldaArena_Free(this->scheduleDmaSegment);
this->scheduleDmaSegment = NULL;
}
#endif
//! @bug: Does not free malloc'd memory for schedule segment
// 2S2H [Port] "Fix" the bug by not allocating anything
}