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

fix potential null pointer access

Browse Source
This commit is contained in:
Raphael Coeffic
2022-06-11 15:13:11 +02:00
committed by Raphael Coeffic
parent 29fcc8d0fd
commit 502b37a19a
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/thirdparty/libopenui/src/choice.cpp
Vendored
+4 -2
View File
@@ -29,8 +29,10 @@ void choicePaintCallback(lv_event_t *e)
lv_obj_t *target = lv_event_get_target(e);
if (target != nullptr) {
ChoiceBase *cb = (ChoiceBase*)lv_obj_get_user_data(target);
std::string text = cb->getLabelText();
lv_label_set_text(cb->label, text.c_str());
if (cb) {
std::string text = cb->getLabelText();
lv_label_set_text(cb->label, text.c_str());
}
}
}
}
radio/src/thirdparty/libopenui/src/menu.cpp
Vendored
+14 -12
View File
@@ -31,19 +31,21 @@ void menuBodyEventCallback(lv_event_t *e)
if (target != nullptr) {
long index = (long)lv_event_get_user_data(e);
MenuBody *mb = (MenuBody *) lv_obj_get_user_data(lv_obj_get_parent(target));
Menu *menu = mb->getParentMenu();
if (index < (int)mb->lines.size()) {
onKeyPress();
if (menu->multiple) {
if (mb->selectedIndex == index)
mb->lines[index].onPress();
else
if (mb) {
Menu *menu = mb->getParentMenu();
if (index < (int)mb->lines.size()) {
onKeyPress();
if (menu->multiple) {
if (mb->selectedIndex == index)
mb->lines[index].onPress();
else
mb->setIndex(index);
}
else {
mb->setIndex(index);
}
else {
mb->setIndex(index);
mb->lines[index].onPress();
menu->deleteLater();
mb->lines[index].onPress();
menu->deleteLater();
}
}
}
}