From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: emacs-28 c05864dd25: Avoid another segfault in 'face_at_buffer_position' Date: Fri, 14 Jan 2022 17:13:47 +0200 Message-ID: <83lezi1has.fsf@gnu.org> References: <164216954392.28421.12737811589765002298@vcs2.savannah.gnu.org> <20220114141224.2E316C0DA30@vcs2.savannah.gnu.org> <87v8ymqs35.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="33252"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Robert Pluim Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Jan 14 16:16:16 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 1n8OJM-0008OV-8r for ged-emacs-devel@m.gmane-mx.org; Fri, 14 Jan 2022 16:16:16 +0100 Original-Received: from localhost ([::1]:35726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8OJK-0006ma-Ip for ged-emacs-devel@m.gmane-mx.org; Fri, 14 Jan 2022 10:16:14 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:34616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8OH1-0005pX-Rw for emacs-devel@gnu.org; Fri, 14 Jan 2022 10:13:51 -0500 Original-Received: from [2001:470:142:3::e] (port=43220 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8OGx-0005Oe-P9; Fri, 14 Jan 2022 10:13:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=aBKVsiGk3MfTF5Apg5Rv341vqKnBcKE9AiY2/XFOUoo=; b=Nd3luXNBHgwGXQiEqAzk I2xY0pc7VVQaHaTb3B9bw7CRwdVRPT0mIfCnuDLG+kAQGLk83efteA937leh1dcu/h4V4OYi9KQ8a 8fVtxh22wBgCmdGh3DamtOV0HqJ3DdljNUrFXoVwuNqJrDnpZDGbd6D6ZH5qoePNZiUsvROa5NX9k SfFXVEvXSQFfY/J3ofuZXvnux8kM37q8jF/cIqlHjf3I8kWsfQC/ywRMZsdihRyKnsnCfMbZSFbrU NjYQPN1zSrQczZAhuCls1flXQyP86hAWaJ5pRgjmW+sm0CbNWKTgxV6E7bx4Ot/Ze7jfUVQ6cZP5g 1fcV0SJdc+/1dw==; Original-Received: from [87.69.77.57] (port=4489 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8OGx-0004U9-QZ; Fri, 14 Jan 2022 10:13:48 -0500 In-Reply-To: <87v8ymqs35.fsf@gmail.com> (message from Robert Pluim on Fri, 14 Jan 2022 16:01:34 +0100) 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:284752 Archived-At: > From: Robert Pluim > Cc: Eli Zaretskii > Date: Fri, 14 Jan 2022 16:01:34 +0100 > > 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, > > Eli> default_face = FACE_FROM_ID_OR_NULL (f, face_id); > Eli> if (!default_face) > Eli> - default_face = FACE_FROM_ID (f, > Eli> - lookup_basic_face (w, f, DEFAULT_FACE_ID)); > Eli> + { > Eli> + if (FRAME_FACE_CACHE (f)->used == 0) > Eli> + recompute_basic_faces (f); > Eli> + default_face = FACE_FROM_ID (f, > Eli> + lookup_basic_face (w, f, DEFAULT_FACE_ID)); > Eli> + } > Eli> } > > If youʼre 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? I want the "usual" case, where default_face is non-NULL, to work as quickly as possible. The face cache being cleared is a relatively rare exception.