mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-22 17:36:22 +00:00
fix: follow-ups to cherry-picked d3d7c328b
- src/xmpp/jid.c: add missing #include "log.h" —d3d7c328bintroduced a log_debug() call in jid_create without pulling in the header, so the source tree did not actually build. - src/omemo/omemo.c omemo_on_message_send: add the missing NULL-check after the gcry_malloc_secure calls for 'tag' / 'key_tag' so a real OOM does not sail into the memcpy/encrypt path. (The 'key' checkd3d7c328badded is defensive only — gcry_random_bytes_secure aborts internally on failure.) - src/omemo/omemo.c _cache_device_identity: drop the second 'if (!fingerprint) return' on the autocomplete path. fingerprint is already NULL-checked at the top of the function and is not reassigned in between, so the second guard is dead code (upstream artefact). - src/tools/editor.c launch_editor: replace the g_main_context_acquire/release pair with g_child_watch_source_new(getpid()) + g_source_unref. acquire/release does not install GLib's SIGCHLD handler — that handler is registered as a side effect of constructing a GChildWatchSource. Now we actually pre-arm SIGCHLD before forking, which is what d3d7c328b's comment claimed. - src/ui/statusbar.c status_bar_inactive / _create_tab: switch the remaining two literal '10' tab-id values to the CONSOLE_TAB_ID define introduced byd3d7c328b, then inline the expression directly into the GINT_TO_POINTER() argument so the one-shot local 'true_win' goes away. Verified with ci-build.sh in Debian docker: all 4 configs pass (644/0, 605/0, 605/0, 644/0 unit + 130/0 functional).
This commit is contained in:
@@ -121,11 +121,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) {
|
||||
|
||||
Reference in New Issue
Block a user