From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#9990: valgrind warning in add_row_entry Date: Fri, 11 Nov 2011 17:59:22 +0200 Message-ID: <83vcqqfy5h.fsf@gnu.org> References: <83k47ailf0.fsf@gnu.org> <83zkg2fzgt.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1321027436 10257 80.91.229.12 (11 Nov 2011 16:03:56 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 11 Nov 2011 16:03:56 +0000 (UTC) Cc: 9990@debbugs.gnu.org To: dann@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Nov 11 17:03:51 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ROta2-0003Hm-QK for geb-bug-gnu-emacs@m.gmane.org; Fri, 11 Nov 2011 17:03:50 +0100 Original-Received: from localhost ([::1]:42263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROta2-0002l8-5L for geb-bug-gnu-emacs@m.gmane.org; Fri, 11 Nov 2011 11:03:50 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:46675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROtZz-0002kz-3m for bug-gnu-emacs@gnu.org; Fri, 11 Nov 2011 11:03:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ROtZx-0001Iu-Sp for bug-gnu-emacs@gnu.org; Fri, 11 Nov 2011 11:03:46 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:44399) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROtZx-0001Ip-Q1 for bug-gnu-emacs@gnu.org; Fri, 11 Nov 2011 11:03:45 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1ROtaE-0006Sr-8B for bug-gnu-emacs@gnu.org; Fri, 11 Nov 2011 11:04:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 11 Nov 2011 16:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9990 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 9990-submit@debbugs.gnu.org id=B9990.132102739324791 (code B ref 9990); Fri, 11 Nov 2011 16:04:02 +0000 Original-Received: (at 9990) by debbugs.gnu.org; 11 Nov 2011 16:03:13 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ROtZR-0006Rn-28 for submit@debbugs.gnu.org; Fri, 11 Nov 2011 11:03:13 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ROtZO-0006Rb-KI for 9990@debbugs.gnu.org; Fri, 11 Nov 2011 11:03:12 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0LUI008006Z7DS00@a-mtaout20.012.net.il> for 9990@debbugs.gnu.org; Fri, 11 Nov 2011 18:01:23 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.126.231.130]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LUI007M1766R790@a-mtaout20.012.net.il>; Fri, 11 Nov 2011 18:01:19 +0200 (IST) In-reply-to: <83zkg2fzgt.fsf@gnu.org> X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Fri, 11 Nov 2011 11:04:02 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 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.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:53810 Archived-At: > Date: Fri, 11 Nov 2011 17:30:58 +0200 > From: Eli Zaretskii > Cc: 9990@debbugs.gnu.org > > However, I spotted something strange related to the call to > row_equal_p, here: > > /* Skip over rows equal at the bottom. */ > i = last_new; > j = last_old; > while (i - 1 > first_new > && j - 1 > first_old > && MATRIX_ROW (current_matrix, i - 1)->enabled_p > && (MATRIX_ROW (current_matrix, i - 1)->y > == MATRIX_ROW (desired_matrix, j - 1)->y) > && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p > && row_equal_p (MATRIX_ROW (desired_matrix, i - 1), > MATRIX_ROW (current_matrix, j - 1), 1)) > --i, --j; > > Some of these conditions use incorrect indices to access the glyph > matrices: `i' should be used for the current matrix and `j' for the > desired matrix. Some of these conditions use `i' and `j' correctly, > some don't. Below is a patch I intend to install, if no one finds any thinko in it. Dan, can you try this and see if it resolves the valgrind complaints (assuming you can reproduce them)? === modified file 'src/dispnew.c' --- src/dispnew.c 2011-10-08 10:58:50 +0000 +++ src/dispnew.c 2011-11-11 15:53:27 +0000 @@ -4334,10 +4334,10 @@ scrolling_window (struct window *w, int j = last_old; while (i - 1 > first_new && j - 1 > first_old - && MATRIX_ROW (current_matrix, i - 1)->enabled_p - && (MATRIX_ROW (current_matrix, i - 1)->y - == MATRIX_ROW (desired_matrix, j - 1)->y) - && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p + && MATRIX_ROW (current_matrix, j - 1)->enabled_p + && (MATRIX_ROW (current_matrix, j - 1)->y + == MATRIX_ROW (desired_matrix, i - 1)->y) + && !MATRIX_ROW (desired_matrix, i - 1)->redraw_fringe_bitmaps_p && row_equal_p (MATRIX_ROW (desired_matrix, i - 1), MATRIX_ROW (current_matrix, j - 1), 1)) --i, --j;