sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix multi-byte menu string buffer overrun (#27100)

Browse Source
This commit is contained in:
Scott Lahteine
2024-05-19 18:43:04 -05:00
committed by GitHub
parent a97d1088f0
commit eec1aec071
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/lcdprint.cpp
View File

@@ -114,7 +114,7 @@ lcd_uint_t expand_u8str_P(char * const outstr, PGM_P const ptpl, const int8_t in
* Return the number of characters emitted
*/
lcd_uint_t lcd_put_u8str_P(PGM_P const ptpl, const int8_t ind, const char *cstr/*=nullptr*/, FSTR_P const fstr/*=nullptr*/, const lcd_uint_t maxlen/*=LCD_WIDTH*/) {
char estr[maxlen + 2];
char estr[maxlen * LANG_CHARSIZE + 2];
const lcd_uint_t outlen = expand_u8str_P(estr, ptpl, ind, cstr, fstr, maxlen);
lcd_put_u8str_max(estr, maxlen * (MENU_FONT_WIDTH));
return outlen;

3
Marlin/src/module/motion.cpp
View File

@@ -1637,8 +1637,7 @@ void prepare_line_to_destination() {
SERIAL_ECHO_START();
msg.echoln();
msg.setf(GET_TEXT_F(MSG_HOME_FIRST), need);
ui.set_status(msg);
ui.status_printf(0, GET_TEXT_F(MSG_HOME_FIRST), need);
return true;
}