12 files changed, 26 insertions, 15 deletions

diff --git a/src/ui/accounts.c b/src/ui/accounts.c
index 969c23d..84e932e 100644
--- a/src/ui/accounts.c
+++ b/src/ui/accounts.c
@@ -95,11 +95,11 @@ handle_dialog_destroy(UNUSED GtkWidget *window,
 {
   MESSENGER_Application *app = (MESSENGER_Application*) user_data;
 
-  ui_accounts_dialog_cleanup(&(app->ui.accounts));
+  if ((app->ui.accounts.show_queued) ||
+      (gtk_widget_is_visible(GTK_WIDGET(app->ui.messenger.main_window))))
+    return;
 
-  if ((!(app->ui.accounts.show_queued)) &&
-      (!gtk_widget_is_visible(GTK_WIDGET(app->ui.messenger.main_window))))
-    gtk_widget_destroy(GTK_WIDGET(app->ui.messenger.main_window));
+  gtk_widget_destroy(GTK_WIDGET(app->ui.messenger.main_window));
 }
 
 static int
@@ -219,5 +219,5 @@ ui_accounts_dialog_cleanup(UI_ACCOUNTS_Handle *handle)
 {
   g_object_unref(handle->builder);
 
-  handle->accounts_listbox = NULL;
+  memset(handle, 0, sizeof(*handle));
 }
diff --git a/src/ui/contacts.c b/src/ui/contacts.c
index 68d18b4..5898fde 100644
--- a/src/ui/contacts.c
+++ b/src/ui/contacts.c
@@ -241,5 +241,5 @@ ui_contacts_dialog_cleanup(UI_CONTACTS_Handle *handle)
 {
   g_object_unref(handle->builder);
 
-  handle->contacts_listbox = NULL;
+  memset(handle, 0, sizeof(*handle));
 }
diff --git a/src/ui/delete_messages.c b/src/ui/delete_messages.c
index 300c42e..1d6b812 100644
--- a/src/ui/delete_messages.c
+++ b/src/ui/delete_messages.c
@@ -149,4 +149,6 @@ void
 ui_delete_messages_dialog_cleanup(UI_DELETE_MESSAGES_Handle *handle)
 {
   g_object_unref(handle->builder);
+
+  memset(handle, 0, sizeof(*handle));
 }
diff --git a/src/ui/invite_contact.c b/src/ui/invite_contact.c
index 272550f..8d410bc 100644
--- a/src/ui/invite_contact.c
+++ b/src/ui/invite_contact.c
@@ -233,5 +233,5 @@ ui_invite_contact_dialog_cleanup(UI_INVITE_CONTACT_Handle *handle)
 {
   g_object_unref(handle->builder);
 
-  handle->contacts_listbox = NULL;
+  memset(handle, 0, sizeof(*handle));
 }
diff --git a/src/ui/messenger.c b/src/ui/messenger.c
index 270360d..633920c 100644
--- a/src/ui/messenger.c
+++ b/src/ui/messenger.c
@@ -275,6 +275,7 @@ handle_main_window_destroy(UNUSED GtkWidget *window,
   MESSENGER_Application *app = (MESSENGER_Application*) user_data;
 
   ui_messenger_cleanup(&(app->ui.messenger));
+  ui_accounts_dialog_cleanup(&(app->ui.accounts));
 
   application_exit(app, MESSENGER_QUIT);
 }
diff --git a/src/ui/new_account.c b/src/ui/new_account.c
index 6642261..2778825 100644
--- a/src/ui/new_account.c
+++ b/src/ui/new_account.c
@@ -188,4 +188,6 @@ void
 ui_new_account_dialog_cleanup(UI_NEW_ACCOUNT_Handle *handle)
 {
   g_object_unref(handle->builder);
+
+  memset(handle, 0, sizeof(*handle));
 }
diff --git a/src/ui/new_contact.c b/src/ui/new_contact.c
index 6438331..7d5d395 100644
--- a/src/ui/new_contact.c
+++ b/src/ui/new_contact.c
@@ -393,8 +393,6 @@ ui_new_contact_dialog_cleanup(UI_NEW_CONTACT_Handle *handle)
   if (0 != handle->idle_processing)
     g_source_remove(handle->idle_processing);
 
-  handle->idle_processing = 0;
-
   g_signal_handler_disconnect(
       handle->id_drawing_area,
       handle->id_draw_signal
@@ -405,8 +403,8 @@ ui_new_contact_dialog_cleanup(UI_NEW_CONTACT_Handle *handle)
   if (handle->image)
     zbar_image_destroy(handle->image);
 
-  handle->image = NULL;
-
   zbar_image_scanner_destroy(handle->scanner);
   zbar_video_destroy(handle->video);
+
+  memset(handle, 0, sizeof(*handle));
 }
diff --git a/src/ui/new_group.c b/src/ui/new_group.c
index d2b287e..6b60145 100644
--- a/src/ui/new_group.c
+++ b/src/ui/new_group.c
@@ -313,4 +313,6 @@ ui_new_group_dialog_cleanup(UI_NEW_GROUP_Handle *handle)
 
   if (handle->contact_entries)
     g_list_free(handle->contact_entries);
+
+  memset(handle, 0, sizeof(*handle));
 }
diff --git a/src/ui/new_lobby.c b/src/ui/new_lobby.c
index 0a9fe37..e75c371 100644
--- a/src/ui/new_lobby.c
+++ b/src/ui/new_lobby.c
@@ -198,7 +198,7 @@ handle_id_drawing_area_draw(GtkWidget* drawing_area,
   const guint w = handle->qr->width;
   const guint w2 = w + m * 2;
 
-  guchar pixels [w2 * w2 * 3];
+  guchar *pixels = (guchar*) g_malloc(sizeof(guchar) * w2 * w2 * 3);
 
   guint x, y, z;
   for (y = 0; y < w2; y++)
@@ -263,10 +263,11 @@ handle_id_drawing_area_draw(GtkWidget* drawing_area,
   g_object_unref(scaled);
   g_object_unref(image);
 
+  g_free(pixels);
+
   return FALSE;
 }
 
-
 void
 ui_new_lobby_dialog_init(MESSENGER_Application *app,
                          UI_NEW_LOBBY_Handle *handle)
@@ -386,7 +387,6 @@ ui_new_lobby_dialog_init(MESSENGER_Application *app,
   );
 }
 
-
 void
 ui_new_lobby_dialog_cleanup(UI_NEW_LOBBY_Handle *handle)
 {
diff --git a/src/ui/new_platform.c b/src/ui/new_platform.c
index 8611432..5eea8d5 100644
--- a/src/ui/new_platform.c
+++ b/src/ui/new_platform.c
@@ -173,4 +173,6 @@ void
 ui_new_platform_dialog_cleanup(UI_NEW_PLATFORM_Handle *handle)
 {
   g_object_unref(handle->builder);
+
+  memset(handle, 0, sizeof(*handle));
 }
diff --git a/src/ui/send_file.c b/src/ui/send_file.c
index 991e8ce..b2e6bb0 100644
--- a/src/ui/send_file.c
+++ b/src/ui/send_file.c
@@ -378,4 +378,6 @@ ui_send_file_dialog_cleanup(UI_SEND_FILE_Handle *handle)
   );
 
   g_object_unref(handle->builder);
+
+  memset(handle, 0, sizeof(*handle));
 }
diff --git a/src/ui/settings.c b/src/ui/settings.c
index 6863968..7583941 100644
--- a/src/ui/settings.c
+++ b/src/ui/settings.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
+   Copyright (C) 2021--2022 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -62,4 +62,6 @@ void
 ui_settings_dialog_cleanup(UI_SETTINGS_Handle *handle)
 {
   g_object_unref(handle->builder);
+
+  memset(handle, 0, sizeof(*handle));
 }