From fad33800dc011d9768a566d5bae53264a793cf3c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 15 Jan 2017 17:16:04 +0100 Subject: [PATCH] Don't crash if the model is badly defined in wxGTK wxDVC Asserting before dereferencing a null pointer (in BuildBranch(), called immediately after the asserts in question) is useless, as usual. Use wxCHECK to complain and avoid crashing instead. Closes #17776. --- src/gtk/dataview.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 7f90301b9b..c24b3eb3d6 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -4041,7 +4041,7 @@ gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter * return FALSE; wxGtkTreeModelNode *parent_node = FindNode( parent ); - wxASSERT_MSG(parent_node, + wxCHECK_MSG(parent_node, FALSE, "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); BuildBranch( parent_node ); @@ -4081,7 +4081,7 @@ gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter ) return FALSE; wxGtkTreeModelNode *node = FindNode( iter ); - wxASSERT_MSG(node, + wxCHECK_MSG(node, FALSE, "Did you forget a call to ItemAdded()? The iterator is unknown to the wxGtkTreeModel"); BuildBranch( node ); @@ -4112,7 +4112,7 @@ gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter ) return 0; wxGtkTreeModelNode *parent_node = FindNode( iter ); - wxASSERT_MSG(parent_node, + wxCHECK_MSG(parent_node, FALSE, "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); BuildBranch( parent_node ); @@ -4152,7 +4152,7 @@ gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter return FALSE; wxGtkTreeModelNode *parent_node = FindNode( parent ); - wxASSERT_MSG(parent_node, + wxCHECK_MSG(parent_node, FALSE, "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); BuildBranch( parent_node );