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.bugs Subject: bug#70385: Crash in note_fringe_highlight Date: Mon, 15 Apr 2024 17:39:03 +0300 Message-ID: <864jc2lmgo.fsf@gnu.org> References: <86h6g49cdv.fsf@mail.linkov.net> <87jzkz1kdn.fsf@yahoo.com> <86r0f6lv76.fsf@gnu.org> <8734rm25zb.fsf@yahoo.com> <86edb6lqw0.fsf@gnu.org> <87y19ezq14.fsf@yahoo.com> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4205"; mail-complaints-to="usenet@ciao.gmane.io" Cc: bjorn.bidar@thaodan.de, juri@linkov.net, 70385@debbugs.gnu.org, vekazanov@gmail.com To: Po Lu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Apr 15 16:40:19 2024 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 1rwNVK-0000pc-Or for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 15 Apr 2024 16:40:18 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwNUv-00063b-TF; Mon, 15 Apr 2024 10:39:53 -0400 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 1rwNUt-00062M-Qy for bug-gnu-emacs@gnu.org; Mon, 15 Apr 2024 10:39:51 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rwNUs-0007oc-4j for bug-gnu-emacs@gnu.org; Mon, 15 Apr 2024 10:39:50 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rwNV3-000062-Qw for bug-gnu-emacs@gnu.org; Mon, 15 Apr 2024 10:40:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 15 Apr 2024 14:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70385 X-GNU-PR-Package: emacs Original-Received: via spool by 70385-submit@debbugs.gnu.org id=B70385.171319196732628 (code B ref 70385); Mon, 15 Apr 2024 14:40:01 +0000 Original-Received: (at 70385) by debbugs.gnu.org; 15 Apr 2024 14:39:27 +0000 Original-Received: from localhost ([127.0.0.1]:37631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwNUU-0008UC-PL for submit@debbugs.gnu.org; Mon, 15 Apr 2024 10:39:27 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwNUS-0008U6-V8 for 70385@debbugs.gnu.org; Mon, 15 Apr 2024 10:39:25 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rwNUB-0007mU-H1; Mon, 15 Apr 2024 10:39:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=hm5qFGOOegWyBw8Ca7h19z9B6a/s1+pUlSF7Y28G3Kg=; b=fi70VK3xkxCo 2oBHwKq+61zSi7EWAIO91AvrSn69db/mRlK1xzOP2VOwxfK74f66G2l6cfINg0gfWPRuhW1wpMheA 6XZN2qSdRxaQkSUtL/H1muJ1AE22D/CLWrD6JWuB1Ib1kr52Kd2HLuQnmsyzZfjuJhVKB0qoiWMTG ZJzXeGIIOiPT8/J2gfnveMp7enBgh48FziD4qX60wZis52XwgPkNh3VfKM2YWegW0n53Lv75hAcdH mdDxXQGbwOtORHljMhoITUrm5mcFVCDYyU7EGwNk7aaBxvecJMXA4qNSOPAPzlfOht57/L1PYusr8 f3KSx8pf9aejgb7xJZzf0g==; In-Reply-To: <87y19ezq14.fsf@yahoo.com> (message from Po Lu on Mon, 15 Apr 2024 21:58:15 +0800) 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:283381 Archived-At: > From: Po Lu > Cc: bjorn.bidar@thaodan.de, vekazanov@gmail.com, 70385@debbugs.gnu.org, > juri@linkov.net > Date: Mon, 15 Apr 2024 21:58:15 +0800 > > Eli Zaretskii writes: > > > I think this should be > > > > if ((window_outdated (w) > > || !w->window_end_valid > > || !MATRIX_ROW_DISPLAYS_TEXT_P (MATRIX_ROW (w->current_matrix, > > vpos))) > > Yes, sorry. > > > I'm not sure it will help, because it seems the segfault happens in > > the MATRIX_ROW_DISPLAYS_TEXT_P macro. So I think we are somehow > > dealing with w->current_matrix whose 'nrows' is too small. The > > mouse-highlight code detects that case in x_y_to_hpos_vpos. > > Right. What about this? > > diff --git a/src/xdisp.c b/src/xdisp.c > index d984c12d1aa..dcecc2b09d4 100644 > --- a/src/xdisp.c > +++ b/src/xdisp.c > @@ -35772,6 +35772,7 @@ note_fringe_highlight (struct frame *f, Lisp_Object window, int x, int y, > /* Don't access the TEXT_AREA of a row that does not display text, or > when the window is outdated. (bug#70385) */ > if (window_outdated (w) > + || (vpos >= w->current_matrix->nrows) > || !MATRIX_ROW_DISPLAYS_TEXT_P (MATRIX_ROW (w->current_matrix, > vpos))) > return; > > It's the same test x_y_to_hpos_vpos applies to decide whether to punt > and return NULL. Yes, LGTM. Let's see if it prevents the crashes.