From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= Newsgroups: gmane.emacs.bugs Subject: bug#54458: 27.2; erc-dcc-get: Re-entering top level after C stack overflow Date: Tue, 29 Mar 2022 19:47:52 +0200 Message-ID: <5A8EE4CF-6F5E-4119-8765-8E301E2BE935@acm.org> References: <78459EAB-314B-4122-8E3B-7F82685D0DBA@acm.org> <83a6da9vm8.fsf@gnu.org> <87r16m46uf.fsf@neverwas.me> <4DA2DB05-D902-42DF-860D-87617FBB74C8@acm.org> <83k0cc907r.fsf@gnu.org> Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.120.0.1.13\)) Content-Type: multipart/mixed; boundary="Apple-Mail=_EC2C41FA-790C-481D-950E-6EC2C9EF3F9E" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="34563"; mail-complaints-to="usenet@ciao.gmane.io" Cc: fernandodemorais.jf@gmail.com, jp@neverwas.me, bandali@gnu.org, 54458@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Mar 29 19:49:17 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nZFy1-0008mo-F3 for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 29 Mar 2022 19:49:17 +0200 Original-Received: from localhost ([::1]:36010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZFxz-0007Zb-QY for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 29 Mar 2022 13:49:15 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:58084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZFwu-0007Wo-G5 for bug-gnu-emacs@gnu.org; Tue, 29 Mar 2022 13:48:09 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:39608) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZFwo-0006WC-KZ for bug-gnu-emacs@gnu.org; Tue, 29 Mar 2022 13:48:07 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZFwo-00026H-Ee for bug-gnu-emacs@gnu.org; Tue, 29 Mar 2022 13:48:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 29 Mar 2022 17:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54458 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo Original-Received: via spool by 54458-submit@debbugs.gnu.org id=B54458.16485760818063 (code B ref 54458); Tue, 29 Mar 2022 17:48:02 +0000 Original-Received: (at 54458) by debbugs.gnu.org; 29 Mar 2022 17:48:01 +0000 Original-Received: from localhost ([127.0.0.1]:33505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZFwm-00025x-R3 for submit@debbugs.gnu.org; Tue, 29 Mar 2022 13:48:01 -0400 Original-Received: from mail214c50.megamailservers.eu ([91.136.10.224]:51540 helo=mail193c50.megamailservers.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZFwk-00025W-Ja for 54458@debbugs.gnu.org; Tue, 29 Mar 2022 13:47:59 -0400 X-Authenticated-User: mattiase@bredband.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=megamailservers.eu; s=maildub; t=1648576075; bh=Y1MHmrzVjtEsUpTuEM1aQkex3PYowLoEdOaOC1JrEas=; h=From:Subject:Date:In-Reply-To:Cc:To:References:From; b=ecHcOSyzLPq/U9LaS80os3O2RH6z7OZPUjmJd3/Wf9o3Q4+Pf6AaCMDnY9VE0MVs5 d+JNVpUWOCIGbxwa88bbplR671vO0NeedKQNISeQms37GAyzTk4f+oCrNRM/Q3ZMJG 2IhHqtN0YTAWIuhzztMAb3kuIHfvobMqpVqsAMrk= Feedback-ID: mattiase@acm.or Original-Received: from smtpclient.apple (c188-150-171-71.bredband.tele2.se [188.150.171.71]) (authenticated bits=0) by mail193c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id 22THlqJS020972; Tue, 29 Mar 2022 17:47:54 +0000 In-Reply-To: <83k0cc907r.fsf@gnu.org> X-Mailer: Apple Mail (2.3654.120.0.1.13) X-CTCH-RefID: str=0001.0A742F1A.6243464B.0072, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-Origin-Country: SE X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:229071 Archived-At: --Apple-Mail=_EC2C41FA-790C-481D-950E-6EC2C9EF3F9E Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii 29 mars 2022 kl. 18.45 skrev Eli Zaretskii : > I think this should be conditioned on the same process being used, no? Oh, yes, that's clearly a valid objection. New attempt attached. --Apple-Mail=_EC2C41FA-790C-481D-950E-6EC2C9EF3F9E Content-Disposition: attachment; filename=send-process-nesting.diff Content-Type: application/octet-stream; x-unix-mode=0644; name="send-process-nesting.diff" Content-Transfer-Encoding: 7bit diff --git a/src/process.c b/src/process.c index 993e1c5603..21ed661062 100644 --- a/src/process.c +++ b/src/process.c @@ -6393,6 +6393,13 @@ write_queue_pop (struct Lisp_Process *p, Lisp_Object *obj, return 1; } +static void +unwind_send_process (void *arg) +{ + struct Lisp_Process *p = arg; + p->in_send_process = 0; +} + /* Send some data to process PROC. BUF is the beginning of the data; LEN is the number of characters. OBJECT is the Lisp object that the data comes from. If OBJECT is @@ -6510,6 +6517,18 @@ send_process (Lisp_Object proc, const char *buf, ptrdiff_t len, buf = SSDATA (object); } + if (p->in_send_process) + { + /* We are already inside a send_process activation higher up the + call chain; let that take care of writing the queued data. */ + write_queue_push (p, object, buf, len, 0); + return; + } + + specpdl_ref count = SPECPDL_INDEX (); + record_unwind_protect_ptr (unwind_send_process, p); + p->in_send_process = 1; + /* If there is already data in the write_queue, put the new data in the back of queue. Otherwise, ignore it. */ if (!NILP (p->write_queue)) @@ -6633,6 +6652,7 @@ send_process (Lisp_Object proc, const char *buf, ptrdiff_t len, } } while (!NILP (p->write_queue)); + unbind_to (count, Qnil); } DEFUN ("process-send-region", Fprocess_send_region, Sprocess_send_region, diff --git a/src/process.h b/src/process.h index 392b661ce6..dd79548ab3 100644 --- a/src/process.h +++ b/src/process.h @@ -173,6 +173,8 @@ #define EMACS_PROCESS_H bool_bf is_non_blocking_client : 1; /* Whether this is a server or a client socket. */ bool_bf is_server : 1; + /* Whether there is an active send_process loop for this process. */ + bool_bf in_send_process : 1; int raw_status; /* The length of the socket backlog. */ int backlog; --Apple-Mail=_EC2C41FA-790C-481D-950E-6EC2C9EF3F9E--