locker98/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix two out of bounds accesses from #13330. (#13525)

Browse Source 
Two occurrences of `MATRIX_ROWS` weren't properly changed to
`ROWS_PER_HAND` in #13330, causing a crash during boot on at least my
Ergodox Infinity (including #13481).
This commit is contained in:
Joakim Tufvegren 2021-07-12 17:43:05 +02:00 committed by GitHub
parent 89980ff004
commit 4706231831
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quantum/matrix.c
View File

@ -149,7 +149,7 @@ static void unselect_row(uint8_t row) {
} }
static void unselect_rows(void) { static void unselect_rows(void) {
for (uint8_t x = 0; x < MATRIX_ROWS; x++) { for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
unselect_row(x); unselect_row(x);
} }
} }
@ -214,7 +214,7 @@ static void unselect_cols(void) {
__attribute__((weak)) void matrix_init_pins(void) { __attribute__((weak)) void matrix_init_pins(void) {
unselect_cols(); unselect_cols();
for (uint8_t x = 0; x < MATRIX_ROWS; x++) { for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
if (row_pins[x] != NO_PIN) { if (row_pins[x] != NO_PIN) {
setPinInputHigh_atomic(row_pins[x]); setPinInputHigh_atomic(row_pins[x]);
} }