Skip to content

Fix compiler warning and potential string buffer overflow #26550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 10 commits into from
Dec 25, 2023
Merged

Fix compiler warning and potential string buffer overflow #26550

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0b0debb
lastEncoderDiff Compiler Warning
soligen2010 Dec 18, 2023
13d200f
Fix potential buffer overflow in status_screen_DOGM.cpp
soligen2010 Dec 18, 2023
2c4c28d
Suggested style change from classicrocker883
soligen2010 Dec 18, 2023
017d199
Update marlinui.cpp. Fixed extra closing parenthesis
soligen2010 Dec 19, 2023
f9f990a
tweak
thinkyhead Dec 20, 2023
15e7aa3
sp
thinkyhead Dec 21, 2023
0ed8f55
relevant string
thinkyhead Dec 21, 2023
a8601c6
safer repchr_t, spaces_t
thinkyhead Dec 21, 2023
04041ec
Fix Lightweight UI
thinkyhead Dec 22, 2023
1887f6a
Merge branch 'bugfix-2.1.x' into pr/soligen2010/26550
thinkyhead Dec 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const

#if HAS_TIME_DISPLAY
static void prepare_time_string(const duration_t &time, char prefix) {
char str[10];
char str[13];
const uint8_t time_len = time.toDigital(str, time.value >= 60*60*24L); // 5 to 8 chars
progressString.set(prefix, ':', spaces_t(10 - time_len), str); // 2 to 5 spaces
}
Expand Down
10 changes: 6 additions & 4 deletions Marlin/src/lcd/marlinui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,11 +1035,13 @@ void MarlinUI::init() {
uint8_t abs_diff = ABS(encoderDiff);

#if ENCODER_PULSES_PER_STEP > 1
static int8_t lastEncoderDiff;
TERN_(HAS_TOUCH_SLEEP, if (lastEncoderDiff != encoderDiff) wakeup_screen());
lastEncoderDiff = encoderDiff;
#if HAS_TOUCH_SLEEP
static int8_t lastEncoderDiff;
if (lastEncoderDiff != encoderDiff) wakeup_screen();
lastEncoderDiff = encoderDiff;
#endif
#endif

const bool encoderPastThreshold = (abs_diff >= epps);
if (encoderPastThreshold && TERN1(IS_TFTGLCD_PANEL, !external_control)) {

Expand Down