fix memleak for styles popup

gtk_get_current_event() returns a copy which must be freed, but wasn't. It is also documented as potentially returning NULL, so add a null check as well.
darktable-org · Jan 23, 2025 · b93c482 · b93c482
1 parent a27aff7
commit b93c482
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/libs/export.c b/src/libs/export.c
@@ -1166,10 +1166,12 @@ static void _update_style(const dt_stylemenu_data_t *menu_data)
 static void _apply_style_activate_callback(GtkMenuItem *menuitem,
                                            const dt_stylemenu_data_t *menu_data)
 {
-  if(gtk_get_current_event()->type == GDK_KEY_PRESS)
+  GdkEvent *event = gtk_get_current_event();
+  if(event && event->type == GDK_KEY_PRESS)
   {
     _update_style(menu_data);
   }
+  gdk_event_free(event);
 }
 
 static gboolean _apply_style_button_callback(GtkMenuItem *menuitem,

diff --git a/src/libs/print_settings.c b/src/libs/print_settings.c
@@ -1186,10 +1186,12 @@ static void _update_style(const dt_stylemenu_data_t *menu_data)
 static void _apply_style_activate_callback(GtkMenuItem *menuitem,
                                            const dt_stylemenu_data_t *menu_data)
 {
-  if(gtk_get_current_event()->type == GDK_KEY_PRESS)
+  GdkEvent *event = gtk_get_current_event();
+  if(event && event->type == GDK_KEY_PRESS)
   {
     _update_style(menu_data);
   }
+  gdk_event_free(event);
 }
 
 static gboolean _apply_style_button_callback(GtkMenuItem *menuitem,