From d91d8c98f825b1d51837bb44f632a075fec32e0d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 10 Feb 2026 17:09:56 +0200 Subject: [PATCH] * src/process.c (server_accept_connection): Fix assertion (bug#80237). --- src/process.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/process.c b/src/process.c index ac29d403c6f..d40500cc050 100644 --- a/src/process.c +++ b/src/process.c @@ -5137,11 +5137,15 @@ server_accept_connection (Lisp_Object server, int channel) /* If the server process is locked to this thread, lock the client process to the same thread, otherwise clear the thread of its I/O descriptors. */ - eassert (!fd_callback_info[p->infd].thread); if (NILP (ps->thread)) - set_proc_thread (p, NULL); + { + eassert (!fd_callback_info[p->infd].thread); + set_proc_thread (p, NULL); + } else { + eassert (!fd_callback_info[p->infd].thread + || fd_callback_info[p->infd].thread == XTHREAD (ps->thread)); eassert (XTHREAD (ps->thread) == current_thread); set_proc_thread (p, XTHREAD (ps->thread)); }