[Emacs-diffs] /srv/bzr/emacs/trunk r106555: Fix bug #10164 with assertion violations in linum-mode.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106555
fixes bug(s): http://debbugs.gnu.org/10164
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2011-11-30 07:25:09 -0500
message:
  Fix bug #10164 with assertion violations in linum-mode.
  
   src/dispnew.c (adjust_glyph_matrix) [XASSERTS]: Ensure ROW's
   attributes are tested _before_ calling verify_row_hash, to protect
   against GCC re-ordering of the tests.
modified:
  src/ChangeLog
  src/dispnew.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-29 18:08:53 +0000
+++ b/src/ChangeLog     2011-11-30 12:25:09 +0000
@@ -1,3 +1,9 @@
+2011-11-30  Eli Zaretskii  <address@hidden>
+
+       * dispnew.c (adjust_glyph_matrix) [XASSERTS]: Ensure ROW's
+       attributes are tested _before_ calling verify_row_hash, to protect
+       against GCC re-ordering of the tests.  (Bug#10164)
+
 2011-11-29  Jan Djärv  <address@hidden>
 
        * xterm.h (struct x_output): net_wm_state_hidden_seen is new.

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2011-11-28 01:07:01 +0000
+++ b/src/dispnew.c     2011-11-30 12:25:09 +0000
@@ -608,9 +608,10 @@
                  row->glyphs[LAST_AREA]
                    = row->glyphs[LEFT_MARGIN_AREA] + dim.width;
                }
-             xassert (!row->enabled_p
-                      || row->mode_line_p
-                      || verify_row_hash (row));
+#if XASSERTS
+             if (row->enabled_p && !row->mode_line_p)
+               verify_row_hash (row));
+#endif
              ++row;
            }
        }