mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix potential null pointer dereferences in fluid

Browse Source
This commit is contained in:
Albrecht Schlosser 2020-02-11 19:01:48 +01:00
parent 6db6440441
commit c4ed2341ec
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fluid/Fl_Widget_Type.cxx
View File

@ -259,7 +259,8 @@ void Fl_Widget_Type::redraw() {
// find the menu button that parents this menu:
do t = t->parent; while (t && t->is_menu_item());
// kludge to cause build_menu to be called again:
t->add_child(0,0);
if (t)
t->add_child(0, 0);
} else {
while (t->parent && t->parent->is_widget()) t = t->parent;
((Fl_Widget_Type*)t)->o->redraw();
@ -638,6 +639,8 @@ const char *item_name(Fl_Menu_Item* m, int i) {
return buffer;
}
int item_number(Fl_Menu_Item* m, const char* i) {
if (!i)
return 0;
if (m && i) {
if (i[0]=='F' && i[1]=='L' && i[2]=='_') i += 3;
while (m->label()) {