From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Robert Pluim Newsgroups: gmane.emacs.devel Subject: Re: emacs-28 c05864dd25: Avoid another segfault in 'face_at_buffer_position' Date: Fri, 14 Jan 2022 16:01:34 +0100 Message-ID: <87v8ymqs35.fsf@gmail.com> References: <164216954392.28421.12737811589765002298@vcs2.savannah.gnu.org> <20220114141224.2E316C0DA30@vcs2.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5145"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Jan 14 16:10:36 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 1n8ODs-0001Dv-9p for ged-emacs-devel@m.gmane-mx.org; Fri, 14 Jan 2022 16:10:36 +0100 Original-Received: from localhost ([::1]:33304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8ODr-0004hN-B7 for ged-emacs-devel@m.gmane-mx.org; Fri, 14 Jan 2022 10:10:35 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:59868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8O5G-0006Ow-Lg for emacs-devel@gnu.org; Fri, 14 Jan 2022 10:01:42 -0500 Original-Received: from [2a00:1450:4864:20::432] (port=39909 helo=mail-wr1-x432.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8O5E-0003Yw-SE; Fri, 14 Jan 2022 10:01:42 -0500 Original-Received: by mail-wr1-x432.google.com with SMTP id s1so16077216wra.6; Fri, 14 Jan 2022 07:01:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:gmane-reply-to-list:date:in-reply-to :message-id:mime-version:content-transfer-encoding; bh=5Eeh4CDn4q5rFLzfuTcDodLvFy3PpEbMBYNr+BoVhUw=; b=GD0Ln1FNhcq6XydpbIUgPq9Fd4SYwCPVTpCOIwd48nwyglIgb1KgM3/iRaPpEQOnxM DiTVd/g/Do1rlwmKmF+IUQ5VcRdFIY0yxJgY81fN111TDQHANObYR+2eNXQRil2K9K5l cogIKSXz3oo3xehvhO8aGapB6mjIXQda5Eu+kJkLXe8U/qtUoconT2Jc/rjTm/1hvI6i 8dk5VptmRQkzKVN6Q2w3+ElObL9SXnTQJNPYsxgEECNuj/Se5J0Dbyp44xd0vWWdy77k GDGAEI6s1DWgT6I3i3pygcOIg5nSNT+TK5YgH17XGsnab/AUNO64jEhdYAuG14fxCCm1 4vjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references :gmane-reply-to-list:date:in-reply-to:message-id:mime-version :content-transfer-encoding; bh=5Eeh4CDn4q5rFLzfuTcDodLvFy3PpEbMBYNr+BoVhUw=; b=VHBOqyVv395vcRlMbHgntrGIMxulnKvYWgWr6yjV0d0V8DUxa1NgChJhhtk6mpUlXi qBvx+EgHsyuu3CnFrc2wO0OKvwwvQAPQkdh13wQ02kdZqSG73/fNEtuuDM7FsJW7DXYL TYL1AUgQo6aEBfmNPepUYXSY9kVRqPa0kCxAEek3GdCgta1IdGmVY2tAmtgrPWKCwHIU nwyLbkWatEl169Tj8GjEyjeUv2yoNIdjYqJr6AGCGyDHh8ANeELpM58lviMASc3d43Qc GJoOnf8oJ2XmWvVX8R+/zeIItMPxurSpvbuEHrDlUUBdRL2e2MUm1bAjznzD89v6RCVa gFsQ== X-Gm-Message-State: AOAM5320esJv2G7owWlMPrmuRNbjlx/nf12d8CMOtdgXRdBJOJqMisDv 6Htyx1Tu8YviIVgNgo7TEminIh1mTBc= X-Google-Smtp-Source: ABdhPJxkgti335W1Oq7X6omdo3CERoTNhw4/p/CIBe4GxUpM2myrhME/mwOyGnIzI41TBgMNdmjkzA== X-Received: by 2002:adf:efc2:: with SMTP id i2mr9095626wrp.89.1642172495908; Fri, 14 Jan 2022 07:01:35 -0800 (PST) Original-Received: from rltb ([2a01:e0a:3f3:fb50:8c0c:d1e6:ef2a:769c]) by smtp.gmail.com with ESMTPSA id f8sm12723760wmg.3.2022.01.14.07.01.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 07:01:35 -0800 (PST) Gmane-Reply-To-List: yes In-Reply-To: <20220114141224.2E316C0DA30@vcs2.savannah.gnu.org> (Eli Zaretskii's message of "Fri, 14 Jan 2022 09:12:24 -0500 (EST)") X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::432 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=rpluim@gmail.com; helo=mail-wr1-x432.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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" Xref: news.gmane.io gmane.emacs.devel:284751 Archived-At: >>>>> On Fri, 14 Jan 2022 09:12:24 -0500 (EST), Eli Zaretskii said: Eli> branch: emacs-28 Eli> commit c05864dd25c820fe250672d32d6ec77ba946670d Eli> Author: Eli Zaretskii Eli> Commit: Eli Zaretskii Eli> Avoid another segfault in 'face_at_buffer_position' =20=20=20=20 Eli> * src/xfaces.c (face_at_buffer_position): Make really sure the Eli> default face is usable. (Bug#53254) Eli> --- Eli> src/xfaces.c | 8 ++++++-- Eli> 1 file changed, 6 insertions(+), 2 deletions(-) Eli> diff --git a/src/xfaces.c b/src/xfaces.c Eli> index b9fb7c0ac1..dff5ae346d 100644 Eli> --- a/src/xfaces.c Eli> +++ b/src/xfaces.c Eli> @@ -6425,8 +6425,12 @@ face_at_buffer_position (struct window *w, = ptrdiff_t pos, =20 Eli> default_face =3D FACE_FROM_ID_OR_NULL (f, face_id); Eli> if (!default_face) Eli> - default_face =3D FACE_FROM_ID (f, Eli> - lookup_basic_face (w, f, DEFAULT_FACE_ID)); Eli> + { Eli> + if (FRAME_FACE_CACHE (f)->used =3D=3D 0) Eli> + recompute_basic_faces (f); Eli> + default_face =3D FACE_FROM_ID (f, Eli> + lookup_basic_face (w, f, DEFAULT_FACE_ID)); Eli> + } Eli> } If you=CA=BCre going to need to check the face cache, how about doing that unconditionally? ie removing FACE_FROM_ID_OR_NULL and the !default_face bit? Robert --=20