piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: stack buffer overflow in PreviewWindow::drawTime (#1945)

Browse Source
This commit is contained in:
Raphael Coeffic
2022-05-07 21:34:29 +10:00
committed by GitHub
parent 7806d5f892
commit 26262c4c92
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/preview_window.h
+5 -6
View File
@@ -282,15 +282,14 @@ class PreviewWindow : public FormGroup
{ {
// time on top bar // time on top bar
struct gtm t; struct gtm t;
char str[10]; char str[16];
char str1[20];
const char *const STR_MONTHS[] = TR_MONTHS; const char *const STR_MONTHS[] = TR_MONTHS;
gettime(&t); gettime(&t);
sprintf(str, "%d %s\n", t.tm_mday, STR_MONTHS[t.tm_mon]); int s = snprintf(str, sizeof(str), "%d %s\n", t.tm_mday, STR_MONTHS[t.tm_mon]);
if (s > 0 && s < sizeof(str) - 6 /* 00:00\0 */) {
getTimerString(str1, getValue(MIXSRC_TX_TIME)); getTimerString(str + s, getValue(MIXSRC_TX_TIME));
strcat(str, str1); }
dc->drawText(rect.w - 40, 5, str, COLOR_THEME_PRIMARY2 | FONT(XS)); dc->drawText(rect.w - 40, 5, str, COLOR_THEME_PRIMARY2 | FONT(XS));
} }