diff options
| author | Benjamin Otte <otte@redhat.com> | 2020-03-05 07:02:24 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2020-03-05 08:14:37 +0100 |
| commit | e356d59a92dfe24ff4a1c5b8300974f0427c90d0 (patch) | |
| tree | 9a1e302fde600e7277d383d34ca11501f4b3afa8 /gtk/gtkrbtree.c | |
| parent | 4be479931666b65a615830d81d739894b5741076 (diff) | |
| download | gtk+-e356d59a92dfe24ff4a1c5b8300974f0427c90d0.tar.gz | |
build: Add -Wnull-dereference
Sprinkle various g_assert() around the code where gcc cannot figure out
on its own that a variable is not NULL and too much refactoring would be
needed to make it do that.
Also fix usage of g_assert_nonnull(x) to use g_assert(x) because the
first is not marked as G_GNUC_NORETURN because of course GTester
supports not aborting on aborts.
Diffstat (limited to 'gtk/gtkrbtree.c')
| -rw-r--r-- | gtk/gtkrbtree.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c index 79bb9b5911..4ccff54084 100644 --- a/gtk/gtkrbtree.c +++ b/gtk/gtkrbtree.c @@ -441,6 +441,7 @@ gtk_rb_tree_remove_node_fixup (GtkRbTree *tree, gtk_rb_node_rotate_left (tree, p); w = p->right; } + g_assert (w); if (is_black (w->left) && is_black (w->right)) { set_red (w); @@ -472,6 +473,7 @@ gtk_rb_tree_remove_node_fixup (GtkRbTree *tree, gtk_rb_node_rotate_right (tree, p); w = p->left; } + g_assert (w); if (is_black (w->right) && is_black (w->left)) { set_red (w); |