mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-30 08:56:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

A few UB fixes (#1272)

Browse Source 
* Fix OoB in ObjDriftie

* Fix OoB in EnHorseLinkChild

* Fix negative shift in jpegdecode

* more oob fixes

* AVOID_UB

* clean

* huh?

* change viint.h macros

* objdriftice

* ub labelling

* review

* review

* fix z_parameter arrays

* u32 cast

* missing &
This commit is contained in:
Anghelo Carvajal
2023-06-24 04:40:26 -04:00
committed by GitHub
parent 19da43859e
commit 9b341a4d6a
10 changed files with 86 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/jpegdecoder.c
+1 -1
View File
@@ -156,7 +156,7 @@ s32 JpegDecoder_ParseNextSymbol(JpegHuffmanTable* hTable, s16* outCoeff, s8* out
if (sym) {
*outCoeff = JpegDecoder_ReadBits(sym);
if (*outCoeff < (1 << (sym - 1))) {
*outCoeff += (-1 << sym) + 1;
*outCoeff += (0xFFFFFFFF << sym) + 1;
}
}
src/code/z_parameter.c
+46 -19
View File
@@ -159,16 +159,33 @@ static Gfx sScreenFillSetupDL[] = {
s16 D_801BF9B0 = 0;
f32 D_801BF9B4[] = { 100.0f, 109.0f };
s16 D_801BF9BC[] = { 0x226, 0x2A8, 0x2A8, 0x2A8 };
s16 D_801BF9BC[] = {
0x226, // EQUIP_SLOT_B
0x2A8, // EQUIP_SLOT_C_LEFT
0x2A8, // EQUIP_SLOT_C_DOWN
0x2A8, // EQUIP_SLOT_C_RIGHT
};
s16 D_801BF9C4[] = { 0x9E, 0x9B };
s16 D_801BF9C8[] = { 0x17, 0x16 };
f32 D_801BF9CC[] = { -380.0f, -350.0f };
s16 D_801BF9D4[] = { 0xA7, 0xE3 };
s16 D_801BF9D8[] = { 0xF9, 0x10F };
s16 D_801BF9DC[] = { 0x11, 0x12 };
s16 D_801BF9E0[] = { 0x22, 0x12 };
s16 D_801BF9E4[] = { 0x23F, 0x26C };
s16 D_801BF9E8[] = { 0x26C, 0x26C };
s16 D_801BF9D4[] = {
0xA7, // EQUIP_SLOT_B
0xE3, // EQUIP_SLOT_C_LEFT
0xF9, // EQUIP_SLOT_C_DOWN
0x10F, // EQUIP_SLOT_C_RIGHT
};
s16 D_801BF9DC[] = {
0x11, // EQUIP_SLOT_B
0x12, // EQUIP_SLOT_C_LEFT
0x22, // EQUIP_SLOT_C_DOWN
0x12, // EQUIP_SLOT_C_RIGHT
};
s16 D_801BF9E4[] = {
0x23F, // EQUIP_SLOT_B
0x26C, // EQUIP_SLOT_C_LEFT
0x26C, // EQUIP_SLOT_C_DOWN
0x26C, // EQUIP_SLOT_C_RIGHT
};
s16 sFinalHoursClockDigitsRed = 0;
s16 sFinalHoursClockFrameEnvRed = 0;
@@ -3848,8 +3865,12 @@ void Interface_DrawItemButtons(PlayState* play) {
// Remnant of OoT
130, 136, 136, 136, 136,
};
static s16 D_801BFAF4[] = { 0x1D, 0x1B };
static s16 D_801BFAF8[] = { 0x1B, 0x1B };
static s16 D_801BFAF4[] = {
0x1D, // EQUIP_SLOT_B
0x1B, // EQUIP_SLOT_C_LEFT
0x1B, // EQUIP_SLOT_C_DOWN
0x1B, // EQUIP_SLOT_C_RIGHT
};
InterfaceContext* interfaceCtx = &play->interfaceCtx;
Player* player = GET_PLAYER(play);
PauseContext* pauseCtx = &play->pauseCtx;
@@ -3863,21 +3884,27 @@ void Interface_DrawItemButtons(PlayState* play) {
gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
// B Button Color & Texture
OVERLAY_DISP = Gfx_DrawTexRectIA8_DropShadow(OVERLAY_DISP, gButtonBackgroundTex, 0x20, 0x20, D_801BF9D4[0],
D_801BF9DC[0], D_801BFAF4[0], D_801BFAF4[0], D_801BF9E4[0] * 2,
D_801BF9E4[0] * 2, 100, 255, 120, interfaceCtx->bAlpha);
OVERLAY_DISP = Gfx_DrawTexRectIA8_DropShadow(
OVERLAY_DISP, gButtonBackgroundTex, 0x20, 0x20, D_801BF9D4[EQUIP_SLOT_B], D_801BF9DC[EQUIP_SLOT_B],
D_801BFAF4[EQUIP_SLOT_B], D_801BFAF4[EQUIP_SLOT_B], D_801BF9E4[EQUIP_SLOT_B] * 2, D_801BF9E4[EQUIP_SLOT_B] * 2,
100, 255, 120, interfaceCtx->bAlpha);
gDPPipeSync(OVERLAY_DISP++);
// C-Left Button Color & Texture
OVERLAY_DISP = Gfx_DrawRect_DropShadow(OVERLAY_DISP, D_801BF9D4[1], D_801BF9DC[1], D_801BFAF4[1], D_801BFAF4[1],
D_801BF9E4[1] * 2, D_801BF9E4[1] * 2, 255, 240, 0, interfaceCtx->cLeftAlpha);
OVERLAY_DISP = Gfx_DrawRect_DropShadow(OVERLAY_DISP, D_801BF9D4[EQUIP_SLOT_C_LEFT], D_801BF9DC[EQUIP_SLOT_C_LEFT],
D_801BFAF4[EQUIP_SLOT_C_LEFT], D_801BFAF4[EQUIP_SLOT_C_LEFT],
D_801BF9E4[EQUIP_SLOT_C_LEFT] * 2, D_801BF9E4[EQUIP_SLOT_C_LEFT] * 2, 255,
240, 0, interfaceCtx->cLeftAlpha);
// C-Down Button Color & Texture
OVERLAY_DISP = Gfx_DrawRect_DropShadow(OVERLAY_DISP, D_801BF9D8[0], D_801BF9E0[0], D_801BFAF8[0], D_801BFAF8[0],
D_801BF9E4[2] * 2, D_801BF9E4[2] * 2, 255, 240, 0, interfaceCtx->cDownAlpha);
OVERLAY_DISP = Gfx_DrawRect_DropShadow(OVERLAY_DISP, D_801BF9D4[EQUIP_SLOT_C_DOWN], D_801BF9DC[EQUIP_SLOT_C_DOWN],
D_801BFAF4[EQUIP_SLOT_C_DOWN], D_801BFAF4[EQUIP_SLOT_C_DOWN],
D_801BF9E4[EQUIP_SLOT_C_DOWN] * 2, D_801BF9E4[EQUIP_SLOT_C_DOWN] * 2, 255,
240, 0, interfaceCtx->cDownAlpha);
// C-Right Button Color & Texture
OVERLAY_DISP =
Gfx_DrawRect_DropShadow(OVERLAY_DISP, D_801BF9D8[1], D_801BF9E0[1], D_801BFAF8[1], D_801BFAF8[1],
D_801BF9E4[3] * 2, D_801BF9E4[3] * 2, 255, 240, 0, interfaceCtx->cRightAlpha);
OVERLAY_DISP = Gfx_DrawRect_DropShadow(OVERLAY_DISP, D_801BF9D4[EQUIP_SLOT_C_RIGHT], D_801BF9DC[EQUIP_SLOT_C_RIGHT],
D_801BFAF4[EQUIP_SLOT_C_RIGHT], D_801BFAF4[EQUIP_SLOT_C_RIGHT],
D_801BF9E4[EQUIP_SLOT_C_RIGHT] * 2, D_801BF9E4[EQUIP_SLOT_C_RIGHT] * 2, 255,
240, 0, interfaceCtx->cRightAlpha);
if (!IS_PAUSE_STATE_GAMEOVER) {
if ((play->pauseCtx.state != PAUSE_STATE_OFF) || (play->pauseCtx.debugEditor != DEBUG_EDITOR_NONE)) {
src/code/z_vimode.c
+4 -4
View File
@@ -153,14 +153,14 @@ void ViMode_Configure(OSViMode* viMode, s32 type, s32 tvType, s32 loRes, s32 ant
viMode->comRegs.vSync++;
if (tvType == OS_TV_MPAL) {
viMode->comRegs.hSync += HSYNC(1, 4);
viMode->comRegs.leap += LEAP((u16)-4, (u16)-2);
viMode->comRegs.leap += LEAP(-4, -2);
}
} else {
viMode->fldRegs[0].vStart += START((u16)-3, (u16)-2);
viMode->fldRegs[0].vStart += START(-3, -2);
if (tvType == OS_TV_MPAL) {
viMode->fldRegs[0].vBurst += BURST((u8)-2, (u8)-1, 12, -1);
viMode->fldRegs[0].vBurst += BURST(-2, -1, 12, -1);
} else if (tvType == OS_TV_PAL) {
viMode->fldRegs[1].vBurst += BURST((u8)-2, (u8)-1, 2, 0);
viMode->fldRegs[1].vBurst += BURST(-2, -1, 2, 0);
}
}