Bug 767228 - Use-after-free in MessageList rebuild under clear_tree() ][

Some missed changes...
This commit is contained in:
Milan Crha
2016-11-28 17:58:08 +01:00
parent 26537ec8d0
commit 402b24dbcd
2 changed files with 7 additions and 4 deletions
+6 -3
View File
@@ -948,6 +948,7 @@ tree_table_adapter_value_at (ETableModel *etm,
gint row)
{
ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
ETreePath path;
switch (col) {
case -1:
@@ -959,9 +960,11 @@ tree_table_adapter_value_at (ETableModel *etm,
case -3:
return etta;
default:
return e_tree_model_value_at (
etta->priv->source_model,
e_tree_table_adapter_node_at_row (etta, row), col);
path = e_tree_table_adapter_node_at_row (etta, row);
if (!path)
return NULL;
return e_tree_model_value_at (etta->priv->source_model, path, col);
}
}
+1 -1
View File
@@ -3180,7 +3180,7 @@ message_list_value_at (ETreeModel *tree_model,
message_list = MESSAGE_LIST (tree_model);
if (G_NODE_IS_ROOT ((GNode *) path))
if (!path || G_NODE_IS_ROOT ((GNode *) path))
return NULL;
/* retrieve the message information array */