fix(ui): add authoritative suspend flag gating redraws over the editor

Builds on the upstream "guard terminal writes while suspended" fix. That
fix keeps isendwin() a valid "suspended" signal by guarding stray writes
(_inp_write, beep, flash) so the existing isendwin() checks in
ui_update/ui_resize/ui_redraw hold. That is correct but fail-open: any
future unguarded doupdate()/refresh() reachable during an editor session
clears isendwin() and the ~10Hz ui_update() repaints over the editor
again (the original bug class).

Track suspension explicitly with a ui_suspended flag set in
ui_suspend()/ui_resume() and gate the three redraw entry points on
ui_suspended || isendwin() via _ui_redraw_suspended(). The flag is set
exactly at the suspend/resume boundary, so the dominant repaint path
fails safe regardless of isendwin() flapping. isendwin() is kept in the
condition for the shutdown/closed-screen case.

src/event/server_events.c

@@ -341,7 +341,7 @@ sv_ev_room_message(ProfMessage* message)
         status_bar_active(num, WIN_MUC, mucwin->roomjid);
 
         if ((g_strcmp0(mynick, message->from_jid->resourcepart) != 0) && (prefs_get_boolean(PREF_BEEP))) {
-            beep();
+            ui_beep();
         }
 
         // not currently on groupchat window
@@ -349,7 +349,7 @@ sv_ev_room_message(ProfMessage* message)
         status_bar_new(num, WIN_MUC, mucwin->roomjid);
 
         if ((g_strcmp0(mynick, message->from_jid->resourcepart) != 0) && (prefs_get_boolean(PREF_FLASH))) {
-            flash();
+            ui_flash();
         }
 
         cons_show_incoming_room_message(message->from_jid->resourcepart, mucwin->roomjid, num, mention, triggers, mucwin->unread, window);

src/omemo/omemo.c

@@ -804,6 +804,10 @@ omemo_on_message_send(ProfWin* win, const char* const message, gboolean request_
     tag_len = AES128_GCM_TAG_LENGTH;
     tag = gcry_malloc_secure(tag_len);
     key_tag = gcry_malloc_secure(AES128_GCM_KEY_LENGTH + AES128_GCM_TAG_LENGTH);
+    if (!tag || !key_tag) {
+        log_error("[OMEMO][SEND] cannot allocate secure buffers");
+        goto out;
+    }
 
     key = gcry_random_bytes_secure(AES128_GCM_KEY_LENGTH + AES128_GCM_IV_LENGTH, GCRY_VERY_STRONG_RANDOM);
     if (!key) {
@@ -1993,10 +1997,6 @@ _cache_device_identity(const char* const jid, uint32_t device_id, ec_public_key*
         g_hash_table_insert(omemo_static_data.fingerprint_ac, strdup(jid), ac);
     }
 
-    if (!fingerprint) {
-        return;
-    }
-
     char* formatted_fingerprint = omemo_format_fingerprint(fingerprint);
     if (formatted_fingerprint) {
         autocomplete_add(ac, formatted_fingerprint);

src/tools/editor.c

@@ -24,7 +24,6 @@
 #include "ncurses.h"
 #include "ui/ui.h"
 #include "xmpp/xmpp.h"
-#include "ui/ui.h"
 
 typedef struct EditorContext
 {
@@ -121,11 +120,11 @@ launch_editor(gchar* initial_content, void (*callback)(gchar* content, void* dat
 
     ui_suspend();
 
-    // Ensure GLib's SIGCHLD handler is installed before forking to prevent
-    // zombie children if the editor is launched before the main loop starts.
-    GMainContext* main_ctx = g_main_context_default();
-    g_main_context_acquire(main_ctx);
-    g_main_context_release(main_ctx);
+    // Force GLib to install its SIGCHLD handler before forking. Creating a
+    // GChildWatchSource for our own pid is the documented trigger; we never
+    // attach or dispatch it, just rely on the side effect.
+    GSource* sigchld_warmup = g_child_watch_source_new(getpid());
+    g_source_unref(sigchld_warmup);
 
     pid_t pid = fork();
     if (pid == -1) {

src/ui/chatwin.c

@@ -327,7 +327,7 @@ chatwin_incoming_msg(ProfChatWin* chatwin, ProfMessage* message, gboolean win_cr
             cons_show_incoming_message(display_name, num, chatwin->unread, window);
 
             if (prefs_get_boolean(PREF_FLASH)) {
-                flash();
+                ui_flash();
             }
 
             chatwin->unread++;
@@ -364,7 +364,7 @@ chatwin_incoming_msg(ProfChatWin* chatwin, ProfMessage* message, gboolean win_cr
         wins_add_quotes_ac(window, message->plain, FALSE);
 
         if (prefs_get_boolean(PREF_BEEP)) {
-            beep();
+            ui_beep();
         }
     }
 

src/ui/core.c

@@ -54,6 +54,7 @@
 
 static int inp_size;
 static gboolean perform_resize = FALSE;
+static gboolean ui_suspended = FALSE;
 static GTimer* ui_idle_time;
 static WINDOW* main_scr;
 
@@ -63,6 +64,16 @@ static Display* display;
 
 static void _ui_draw_term_title(void);
 
+// Skip drawing while an external editor is active (ui_suspended) or after the
+// screen has been closed (endwin). The flag is authoritative and does not rely
+// on isendwin() staying TRUE, which a stray doupdate() during the session could
+// otherwise clear.
+static gboolean
+_ui_redraw_suspended(void)
+{
+    return ui_suspended || isendwin();
+}
+
 static void
 _ui_close(void)
 {
@@ -120,8 +131,7 @@ ui_sigwinch_handler(int sig)
 void
 ui_update(void)
 {
-    // UI is suspended
-    if (isendwin()) {
+    if (_ui_redraw_suspended()) {
         return;
     }
 
@@ -179,22 +189,40 @@ ui_reset_idle_time(void)
 void
 ui_suspend(void)
 {
+    ui_suspended = TRUE;
     inp_suspend();
+    doupdate();
     endwin();
 }
 
 void
 ui_resume(void)
 {
+    ui_suspended = FALSE;
     refresh();
     inp_resume();
 }
 
+void
+ui_beep(void)
+{
+    if (!isendwin()) {
+        beep();
+    }
+}
+
+void
+ui_flash(void)
+{
+    if (!isendwin()) {
+        flash();
+    }
+}
+
 void
 ui_resize(void)
 {
-    // UI is suspended
-    if (isendwin()) {
+    if (_ui_redraw_suspended()) {
         return;
     }
 
@@ -216,8 +244,7 @@ ui_resize(void)
 void
 ui_redraw(void)
 {
-    // UI is suspended
-    if (isendwin()) {
+    if (_ui_redraw_suspended()) {
         return;
     }
 

src/ui/inputwin.c

@@ -311,7 +311,10 @@ inp_get_line(void)
     werase(inp_win);
     wmove(inp_win, 0, 0);
     _inp_win_update_virtual();
-    doupdate();
+    // Don't write to the terminal while suspended (external editor active).
+    if (!is_suspended && !isendwin()) {
+        doupdate();
+    }
     char* line = NULL;
     while (!line) {
         line = inp_readline();
@@ -338,7 +341,10 @@ inp_get_password(void)
     werase(inp_win);
     wmove(inp_win, 0, 0);
     _inp_win_update_virtual();
-    doupdate();
+    // Don't write to the terminal while suspended (external editor active).
+    if (!is_suspended && !isendwin()) {
+        doupdate();
+    }
     char* password = NULL;
     get_password = TRUE;
     while (!password) {
@@ -459,7 +465,9 @@ _inp_write(char* line, int offset)
     _inp_win_handle_scroll();
 
     _inp_win_update_virtual();
-    doupdate();
+    if (!isendwin()) {
+        doupdate();
+    }
 }
 
 static int

src/ui/privwin.c

@@ -57,7 +57,7 @@ privwin_incoming_msg(ProfPrivateWin* privatewin, ProfMessage* message)
         privatewin->unread++;
 
         if (prefs_get_boolean(PREF_FLASH)) {
-            flash();
+            ui_flash();
         }
     }
 
@@ -65,7 +65,7 @@ privwin_incoming_msg(ProfPrivateWin* privatewin, ProfMessage* message)
     wins_add_quotes_ac(window, message->plain, TRUE);
 
     if (prefs_get_boolean(PREF_BEEP)) {
-        beep();
+        ui_beep();
     }
 
     if (notify) {

src/ui/statusbar.c

@@ -170,12 +170,7 @@ status_bar_current(guint i)
 void
 status_bar_inactive(const int win)
 {
-    int true_win = win;
-    if (true_win == 0) {
-        true_win = 10;
-    }
-
-    g_hash_table_remove(statusbar->tabs, GINT_TO_POINTER(true_win));
+    g_hash_table_remove(statusbar->tabs, GINT_TO_POINTER((win == 0) ? CONSOLE_TAB_ID : win));
 
     status_bar_draw();
 }
@@ -183,8 +178,6 @@ status_bar_inactive(const int win)
 void
 _create_tab(const int win, win_type_t wintype, char* identifier, gboolean highlight)
 {
-    int true_win = win == 0 ? 10 : win;
-
     StatusBarTab* tab = g_new0(StatusBarTab, 1);
     tab->identifier = strdup(identifier);
     tab->highlight = highlight;
@@ -214,7 +207,7 @@ _create_tab(const int win, win_type_t wintype, char* identifier, gboolean highli
         }
     }
 
-    g_hash_table_replace(statusbar->tabs, GINT_TO_POINTER(true_win), tab);
+    g_hash_table_replace(statusbar->tabs, GINT_TO_POINTER((win == 0) ? CONSOLE_TAB_ID : win), tab);
 
     status_bar_draw();
 }

src/ui/ui.h

@@ -84,6 +84,8 @@ void ui_handle_recipient_error(const char* const recipient, const char* const er
 void ui_handle_error(const char* const err_msg);
 void ui_clear_win_title(void);
 void ui_goodbye_title(void);
+void ui_beep(void);
+void ui_flash(void);
 void ui_handle_room_configuration_form_error(const char* const roomjid, const char* const message);
 void ui_handle_room_config_submit_result(const char* const roomjid);
 void ui_handle_room_config_submit_result_error(const char* const roomjid, const char* const message);

src/xmpp/jid.c

@@ -15,6 +15,7 @@
 #include <glib.h>
 
 #include "common.h"
+#include "log.h"
 #include "xmpp/jid.h"
 
 #define JID_MAX_PART_LEN  1023

tests/unittests/ui/stub_ui.c

@@ -1475,3 +1475,13 @@ ui_is_suspended(void)
 {
     return FALSE;
 }
+
+void
+ui_beep(void)
+{
+}
+
+void
+ui_flash(void)
+{
+}