summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorEdward Sheldrake <ejsheldrake@gmail.com>2014-10-28 01:28:35 +0100
committerMikael Magnusson <mikachu@gmail.com>2014-10-28 04:14:24 +0100
commit26951b0d4c90fa04b94561c9ff717dc700ba482b (patch)
treeaff93a8c981d99b010753223ec05251240ad87ad /openbox
parent130075de743f6e37206ddf4419265899284179fd (diff)
Fix use after free in menu_entry_frame_free
Diffstat (limited to 'openbox')
-rw-r--r--openbox/menuframe.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index c390c078..7868df39 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -203,8 +203,6 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry,
static void menu_entry_frame_free(ObMenuEntryFrame *self)
{
if (self) {
- menu_entry_unref(self->entry);
-
window_remove(self->window);
XDestroyWindow(obt_display, self->text);
@@ -221,6 +219,7 @@ static void menu_entry_frame_free(ObMenuEntryFrame *self)
g_hash_table_remove(menu_frame_map, &self->bullet);
}
+ menu_entry_unref(self->entry);
g_slice_free(ObMenuEntryFrame, self);
}
}