mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 12:42:30 +04:00
Code Issues Activity

DialogEx: Fix NULL ptr crash (#3878)

Browse Source
This commit is contained in:
WillyJL
2024-09-05 23:13:03 +02:00
committed by GitHub
parent 20aff7320f
commit c6326915ae
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
applications/services/gui/modules/dialog_ex.c
View File

@@ -222,7 +222,7 @@ void dialog_ex_set_header(
dialog_ex->view, dialog_ex->view,
DialogExModel * model, DialogExModel * model,
{ {
furi_string_set(model->header.text, text); furi_string_set(model->header.text, text ? text : "");
model->header.x = x; model->header.x = x;
model->header.y = y; model->header.y = y;
model->header.horizontal = horizontal; model->header.horizontal = horizontal;
@@ -243,7 +243,7 @@ void dialog_ex_set_text(
dialog_ex->view, dialog_ex->view,
DialogExModel * model, DialogExModel * model,
{ {
furi_string_set(model->text.text, text); furi_string_set(model->text.text, text ? text : "");
model->text.x = x; model->text.x = x;
model->text.y = y; model->text.y = y;
model->text.horizontal = horizontal; model->text.horizontal = horizontal;
@@ -268,7 +268,10 @@ void dialog_ex_set_icon(DialogEx* dialog_ex, uint8_t x, uint8_t y, const Icon* i
void dialog_ex_set_left_button_text(DialogEx* dialog_ex, const char* text) { void dialog_ex_set_left_button_text(DialogEx* dialog_ex, const char* text) {
furi_check(dialog_ex); furi_check(dialog_ex);
with_view_model( with_view_model(
dialog_ex->view, DialogExModel * model, { furi_string_set(model->left_text, text); }, true); dialog_ex->view,
DialogExModel * model,
{ furi_string_set(model->left_text, text ? text : ""); },
true);
} }
void dialog_ex_set_center_button_text(DialogEx* dialog_ex, const char* text) { void dialog_ex_set_center_button_text(DialogEx* dialog_ex, const char* text) {
@@ -276,7 +279,7 @@ void dialog_ex_set_center_button_text(DialogEx* dialog_ex, const char* text) {
with_view_model( with_view_model(
dialog_ex->view, dialog_ex->view,
DialogExModel * model, DialogExModel * model,
{ furi_string_set(model->center_text, text); }, { furi_string_set(model->center_text, text ? text : ""); },
true); true);
} }
@@ -285,7 +288,7 @@ void dialog_ex_set_right_button_text(DialogEx* dialog_ex, const char* text) {
with_view_model( with_view_model(
dialog_ex->view, dialog_ex->view,
DialogExModel * model, DialogExModel * model,
{ furi_string_set(model->right_text, text); }, { furi_string_set(model->right_text, text ? text : ""); },
true); true);
} }