Fixed|libappfw|DialogWidget: Potential null pointer dereference

If DialogWidget::buttonWidget() was called with a label string that is not the dialog, a null pointer dereference would occur. Now an exception is thrown in this case.
skyjake · Apr 20, 2014 · f3c734e · f3c734e
1 parent 3401f02
commit f3c734e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/doomsday/libappfw/include/de/widgets/dialogwidget.h b/doomsday/libappfw/include/de/widgets/dialogwidget.h
@@ -130,6 +130,9 @@ class LIBAPPFW_PUBLIC DialogWidget : public PopupWidget
         RoleFlags _role;
     };
 
+    /// Asked for a label that does not exist in the dialog. @ingroup errors
+    DENG2_ERROR(UndefinedLabel);
+
 public:
     DialogWidget(String const &name = "", Flags const &flags = DefaultFlags);
 

diff --git a/doomsday/libappfw/src/widgets/dialogwidget.cpp b/doomsday/libappfw/src/widgets/dialogwidget.cpp
@@ -453,9 +453,9 @@ ButtonWidget &DialogWidget::buttonWidget(de::String const &label) const
     if(w) return w->as<ButtonWidget>();
 
     w = d->extraButtons->organizer().itemWidget(label);
-    DENG2_ASSERT(w != 0);
+    if(w) return w->as<ButtonWidget>();
 
-    return w->as<ButtonWidget>();
+    throw UndefinedLabel("DialogWidget::buttonWidget", "Undefined label \"" + label + "\"");
 }
 
 ButtonWidget *DialogWidget::buttonWidget(int roleId) const