Skip to content

Commit f0ef8f3

Browse files
authored
Fix some out of bound array access. (#862)
1 parent f6a1cc5 commit f0ef8f3

File tree

2 files changed

+3
-19
lines changed

2 files changed

+3
-19
lines changed

src/Cafe/OS/libs/snd_core/ax_internal.h

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -150,23 +150,7 @@ namespace snd_core
150150
/* +0x1E4 */ uint16 a1;
151151
/* +0x1E6 */ uint16 a2;
152152
}biquad;
153-
uint16 reserved1E8[1];
154-
uint16 reserved1EA;
155-
uint16 reserved1EC;
156-
uint16 reserved1EE;
157-
uint32 reserved1F0[4];
158-
uint16 reserved200;
159-
uint16 reserved202;
160-
uint16 reserved204;
161-
uint16 reserved206;
162-
uint16 reserved208;
163-
uint16 reserved20A;
164-
uint16 reserved20C;
165-
uint16 reserved20E;
166-
uint16 reserved210;
167-
uint16 reserved212;
168-
uint16 reserved214;
169-
uint16 reserved216;
153+
uint16 reserved1E8[0x18];
170154
uint16 reserved218[0x20]; // not related to device mix?
171155
uint16 reserved258[0x10]; // not related to device mix?
172156
// rmt src related

src/Cafe/OS/libs/snd_user/snd_user.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ namespace snd
247247
channel->drc_control[index].fader = 0;
248248
channel->drc_control[index].lfe = -960;
249249

250-
for (size_t i = 0; i < AX_MAX_NUM_BUS; ++i)
250+
for (size_t i = 0; i < AX_AUX_BUS_COUNT; ++i)
251251
{
252252
channel->drc_control[index].aux[i] = -960;
253253
}
@@ -272,7 +272,7 @@ namespace snd
272272
channel->rmt_control[index].fader = 0;
273273
channel->rmt_control[index].lfe = -960;
274274

275-
for (size_t i = 0; i < AX_MAX_NUM_BUS; ++i)
275+
for (size_t i = 0; i < AX_AUX_BUS_COUNT; ++i)
276276
{
277277
channel->rmt_control[index].aux[i] = -960;
278278
}

0 commit comments

Comments
 (0)