mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-24 15:29:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Avoid NULL deref when deleting a node, causing empty ancestor nodes to be deleted.

Browse Source
This commit is contained in:
Michael Drake 2013-10-03 00:13:18 +01:00
parent 2a4fb9ecd1
commit 69e3963dae
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desktop/treeview.c
View File

@ -1185,13 +1185,14 @@ nserror treeview_delete_node(treeview *tree, treeview_node *n,
{
nserror err;
struct rect r;
treeview_node *p;
bool visible;
assert(tree != NULL);
assert(n != NULL);
assert(n->parent != NULL);
p = n->parent;
visible = n->parent->flags & TREE_NODE_EXPANDED;
r.y0 = treeview_node_y(tree, n);
r.y1 = tree->root->height;
@ -1217,8 +1218,7 @@ nserror treeview_delete_node(treeview *tree, treeview_node *n,
}
/* Redraw */
if (p->flags & TREE_NODE_EXPANDED &&
!(flags & TREE_OPTION_SUPPRESS_REDRAW)) {
if (visible && !(flags & TREE_OPTION_SUPPRESS_REDRAW)) {
r.x0 = 0;
r.x1 = REDRAW_MAX;
tree->cw_t->redraw_request(tree->cw_h, &r);