From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu Newsgroups: gmane.emacs.devel Subject: Re: emacs-29 0e39ad6fa5: Fix crash after X error Date: Sat, 24 Dec 2022 17:38:44 +0800 Message-ID: <87lemxnntn.fsf@yahoo.com> References: <83fsd55hla.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30372"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Dec 24 10:39:40 2022 Return-path: Envelope-to: ged-emacs-devel@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 1p910F-0007h8-P7 for ged-emacs-devel@m.gmane-mx.org; Sat, 24 Dec 2022 10:39:39 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p90zd-0003XA-DX; Sat, 24 Dec 2022 04:39:01 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p90zb-0003Wz-Hn for emacs-devel@gnu.org; Sat, 24 Dec 2022 04:38:59 -0500 Original-Received: from sonic317-34.consmr.mail.ne1.yahoo.com ([66.163.184.45]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p90zZ-0001ZE-Ll for emacs-devel@gnu.org; Sat, 24 Dec 2022 04:38:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1671874733; bh=HyE7w/wjlCYeJBdIZ+Bs9Wdyt2OITm7DMTw3PRaWpRc=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From:Subject:Reply-To; b=r7oKXlr4JcwzcOTDq3HpSMKhhkW0ao51aTPkceS/heOZDJHc0bJy/WxGK3D7AZ4qMD9J+B2aAKPJhLjDkcxRFFocpbKmImQl4TVYJyZuUBVfSdGbkdVhVtaP3N8F7zWMzuCLlJWh/Di2ZqDCNnuogYuKDdo5Im38XXZne1HhoHVyyXrNu8VVWTClYwN99BJi6WG8p+Ib3mqlQni4JtW5xNCsrbG6QXQbTwonWHSf3/z9EetFfq5F9DLlwTcH/d8waphoFzQvw9zzZD+mDWsSkMKT4S1eSeKM/ZoEJH9K/68Q6uJhgTgMVLwmwhQMOqYdwEcktqDdBrTOeT+8XsclAg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1671874733; bh=z37NpeXcrk4El0PoXpAzumZ17TO+tajtks4uuPO0J2m=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=X/eFKE1HfPzQ4MUhc9yHxIfX11M0m2b/x4o4otU7K4bWj4iIeI8vyhM6no8mzdoUp0F41SlJYOThjQsVuheldK2iR9GqncY8AZ9VMyx4VfugqfGAmzPvgI+ILmcWYrMFC1hilVOc9hJipXzfFkYbacgStWN/OlGiUDrD2jOUkX72H7W4euZSI/eDoGoAuH6P06vbylNhorCXPmIy2kgtVHm+8GT49XRtBAimdYymknxxPYmR/SAAMif/CA+KE3W3a21uhffjeZvQcnxsayMSnoJSVkSLPU/aTAuz/DJTq2TmnnGelvLblm62E2gCIYPwoZAaTM/VRXdrroc45EsV9g== X-YMail-OSG: cIsP0hoVM1nvJnoRtp27_6Gvz2HCIhThhy_9lH.cAMzT.FO9vRWB1wwDUYvhZ2N u6n7wiOXykqrYIYuQZItNK6ZwdDibR2Z13xktPyWX9kfrOjgsV3kVLyOCm2PIav3am.7lQtHwLVj e_jIajLizVc11B1vu9XX_3SX4WwoulfswJb3d0W5sEq71U9OVQIrCD0swu7U6ku0ZvKCoeqgAYOZ l.r9QMfjdodjMvzXbvs2ue2VmhPyPAgkbNynAPqfawZFFFYsqM3uMciPsFJUxf4WUm996UQ11952 QKVKaUkob6IoC3YhIpCTkL7qZmNfAA6N5qvJwu_CC_Dzja_oQHUISawe8cKo983fw4TWTxmyFMUM dyD99dL8g3CLh8gJBG.jTfeUHNrXjr4foMOV2s4V2nYjxVy3FeWjgSx_3G2kQ6xNIl0NdPqURHQx yItxLbg1bU2GQUNRU7hklwH3qg_yyPQTVxsyN2AyyiyZz4FbVCkmBUmnUFelNlliOxjh4Y1dfYwM 4Xo1S22aUJ3KfZE.uN5FEG_9j3K6Nis51iDnnLGLQhQhK2Glp1Eb1HD1wI3meYWiQKNc4l5DZ3sZ aqC9bqkao0a6GhZzEXafnS9VmALIzDzzdcukDuC0LMvya4kT_UDShRNtPsRuTA_onI988.OBBqhV Ld9Q3Tdjp55b4hS9RUXYzLU.ft_b52HA2kx2UsOVoBGpZJZWC_9q7bIx9nBySCGkZTBAtDcHMXiJ cX3lYL8GRDqv0T8XywMeY4pJLoJYi4LEW8A2KB34daOe9zshE5Y1TloKKUBjUL47fn7rqdddBcu2 z8ppjuwhzZ3eIQ0jKN_YzhoXa0X4zO2WjuX87Kmm0y X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.ne1.yahoo.com with HTTP; Sat, 24 Dec 2022 09:38:53 +0000 Original-Received: by hermes--production-sg3-b666c6484-7wpvn (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 725bcd325a48bed61ad014eab6ff2579; Sat, 24 Dec 2022 09:38:49 +0000 (UTC) In-Reply-To: <83fsd55hla.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 24 Dec 2022 10:30:41 +0200") X-Mailer: WebService/1.1.20982 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Received-SPF: pass client-ip=66.163.184.45; envelope-from=luangruo@yahoo.com; helo=sonic317-34.consmr.mail.ne1.yahoo.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:301832 Archived-At: Eli Zaretskii writes: >> diff --git a/src/xdisp.c b/src/xdisp.c >> index 06c8b7730c..4e5250486f 100644 >> --- a/src/xdisp.c >> +++ b/src/xdisp.c >> @@ -16838,6 +16838,13 @@ redisplay_internal (void) >> /* Only GC scrollbars when we redisplay the whole frame. */ >> = f->redisplay || !REDISPLAY_SOME_P (); >> bool f_redisplay_flag = f->redisplay; >> + >> + /* The X error handler may have deleted that frame >> + before we went back to retry_frame. This must come >> + before any accesses to f->terminal. */ >> + if (!FRAME_LIVE_P (f)) >> + continue; >> + >> /* Mark all the scroll bars to be removed; we'll redeem >> the ones we want when we redisplay their windows. */ >> if (gcscrollbars && FRAME_TERMINAL (f)->condemn_scroll_bars_hook) >> @@ -16845,7 +16852,6 @@ redisplay_internal (void) >> >> if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) >> { >> - >> /* Don't allow freeing images and faces for this >> frame as long as the frame's update wasn't >> completed. This prevents crashes when some Lisp >> @@ -16861,10 +16867,6 @@ redisplay_internal (void) >> else if (!REDISPLAY_SOME_P ()) >> f->redisplay = true; >> >> - /* The X error handler may have deleted that frame. */ >> - if (!FRAME_LIVE_P (f)) >> - continue; >> - >> /* Any scroll bars which redisplay_windows should have >> nuked should now go away. */ >> if (gcscrollbars && FRAME_TERMINAL (f)->judge_scroll_bars_hook) > > Any reason not to have this test in both places? I don't want to make > unsafe changes on the release branch. Sure, please feel free to make that change. Thanks.