diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-07-15 23:56:34 -0700 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-07-15 23:56:34 -0700 |
| commit | 09f5767072b65d98371199ab03981940d132b123 (patch) | |
| tree | 64ff932bff4e796447a65f2fb9a4241379257668 /quantum/process_keycode | |
| parent | ed6a872911ba13383585002699a0024510d7b1f4 (diff) | |
| download | qmk_firmware-09f5767072b65d98371199ab03981940d132b123.tar.gz qmk_firmware-09f5767072b65d98371199ab03981940d132b123.zip | |
Add out of bound check for Leader Key sequence array (#5840)
* Add out of bound check for Leader Key sequence array
* A shot at advanced C stuff for Leader Key optimization
* Revert most changes
* Change default back
* Include string.h if compiling for ARM
* Use sizeof instead of a number
Diffstat (limited to 'quantum/process_keycode')
| -rw-r--r-- | quantum/process_keycode/process_leader.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/quantum/process_keycode/process_leader.c b/quantum/process_keycode/process_leader.c index 897e9eabf..ee8099ca2 100644 --- a/quantum/process_keycode/process_leader.c +++ b/quantum/process_keycode/process_leader.c | |||
| @@ -17,6 +17,9 @@ | |||
| 17 | #ifdef LEADER_ENABLE | 17 | #ifdef LEADER_ENABLE |
| 18 | 18 | ||
| 19 | #include "process_leader.h" | 19 | #include "process_leader.h" |
| 20 | #ifdef __arm__ | ||
| 21 | # include <string.h> | ||
| 22 | #endif | ||
| 20 | 23 | ||
| 21 | #ifndef LEADER_TIMEOUT | 24 | #ifndef LEADER_TIMEOUT |
| 22 | #define LEADER_TIMEOUT 300 | 25 | #define LEADER_TIMEOUT 300 |
| @@ -41,11 +44,7 @@ void qk_leader_start(void) { | |||
| 41 | leading = true; | 44 | leading = true; |
| 42 | leader_time = timer_read(); | 45 | leader_time = timer_read(); |
| 43 | leader_sequence_size = 0; | 46 | leader_sequence_size = 0; |
| 44 | leader_sequence[0] = 0; | 47 | memset(leader_sequence, 0, sizeof(leader_sequence)); |
| 45 | leader_sequence[1] = 0; | ||
| 46 | leader_sequence[2] = 0; | ||
| 47 | leader_sequence[3] = 0; | ||
| 48 | leader_sequence[4] = 0; | ||
| 49 | } | 48 | } |
| 50 | 49 | ||
| 51 | bool process_leader(uint16_t keycode, keyrecord_t *record) { | 50 | bool process_leader(uint16_t keycode, keyrecord_t *record) { |
| @@ -58,8 +57,13 @@ bool process_leader(uint16_t keycode, keyrecord_t *record) { | |||
| 58 | keycode = keycode & 0xFF; | 57 | keycode = keycode & 0xFF; |
| 59 | } | 58 | } |
| 60 | #endif // LEADER_KEY_STRICT_KEY_PROCESSING | 59 | #endif // LEADER_KEY_STRICT_KEY_PROCESSING |
| 61 | leader_sequence[leader_sequence_size] = keycode; | 60 | if ( leader_sequence_size < ( sizeof(leader_sequence) / sizeof(leader_sequence[0]) ) ) { |
| 62 | leader_sequence_size++; | 61 | leader_sequence[leader_sequence_size] = keycode; |
| 62 | leader_sequence_size++; | ||
| 63 | } else { | ||
| 64 | leading = false; | ||
| 65 | leader_end(); | ||
| 66 | } | ||
| 63 | #ifdef LEADER_PER_KEY_TIMING | 67 | #ifdef LEADER_PER_KEY_TIMING |
| 64 | leader_time = timer_read(); | 68 | leader_time = timer_read(); |
| 65 | #endif | 69 | #endif |
