diff options
| author | Ted M Lin <tedmlin@gmail.com> | 2020-02-11 16:38:20 -0500 |
|---|---|---|
| committer | Florian Didron <fdidron@users.noreply.github.com> | 2020-02-26 10:15:12 +0900 |
| commit | 79386844a45996fd0402bb0e94561ed4c9799847 (patch) | |
| tree | 314704135e39745e21351c82c9e66269fbcbe0d1 /drivers/oled/oled_driver.h | |
| parent | f3154a54facfe8ad26246d9bbe05335ba5d0f716 (diff) | |
Fix out of bound OLED font access (#8145)
* Fix out of bound OLED font access
The default font is 1344 bytes, or a total of 224 glyphs (each 6-bytes wide).
OLED_FONT_END defaults to 224, which if used will then index off the end of
the font array. So either the documentation or code is wrong.
Instead of figuring out the rewording of the documentation, just change
the OLED_FONT_END default value to 223, to match the documentation and code.
* Add static assert to check array size
Build bomb if the font array size doesn't match to the defines.
Diffstat (limited to 'drivers/oled/oled_driver.h')
| -rw-r--r-- | drivers/oled/oled_driver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/oled/oled_driver.h b/drivers/oled/oled_driver.h index 8959609a0f..5aea710dd4 100644 --- a/drivers/oled/oled_driver.h +++ b/drivers/oled/oled_driver.h @@ -131,7 +131,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #endif // unsigned char value of the last character in the font file #if !defined(OLED_FONT_END) -# define OLED_FONT_END 224 +# define OLED_FONT_END 223 #endif // Font render width #if !defined(OLED_FONT_WIDTH) @@ -260,4 +260,4 @@ bool oled_scroll_off(void); uint8_t oled_max_chars(void); // Returns the maximum number of lines that will fit on the oled -uint8_t oled_max_lines(void);
\ No newline at end of file +uint8_t oled_max_lines(void); |