From 73d6c093dc3b6363835f53edac65799c6422493b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 30 Nov 2011 18:50:38 +0200 Subject: [PATCH] REALLY fix bug #10164 with crashes when linum-mode is turned on. src/dispnew.c (adjust_glyph_matrix): Remove the assertion that verifies glyph row's hash code--we have just reallocated the glyphs, so their contents can be complete garbage. --- src/ChangeLog | 6 ++++++ src/dispnew.c | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4121da08617..cd3d5b0ac3c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-11-30 Eli Zaretskii + + * dispnew.c (adjust_glyph_matrix): Remove the assertion that + verifies glyph row's hash code--we have just reallocated the + glyphs, so their contents can be complete garbage. (Bug#10164) + 2011-11-30 Juanma Barranquero * dispnew.c (adjust_glyph_matrix) [XASSERTS]: Add missing check. diff --git a/src/dispnew.c b/src/dispnew.c index d2f33f0b5e4..2c0e74d0dde 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -608,10 +608,6 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y row->glyphs[LAST_AREA] = row->glyphs[LEFT_MARGIN_AREA] + dim.width; } -#if XASSERTS - if (row->enabled_p && !row->mode_line_p) - xassert (verify_row_hash (row)); -#endif ++row; } } -- 2.39.5