Merge from origin/emacs-25

[gnu-emacs] / src / dispnew.c

diff --git a/src/dispnew.c b/src/dispnew.c
index b05356a3b64e2a181a6ace6fb62527bd363c84ae..a9f06eb3c123c7a1d82dfccab9fba4e1125f67b9 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -681,7 +681,9 @@ void
 clear_glyph_matrix_rows (struct glyph_matrix *matrix, int start, int end)
 {
   eassert (start <= end);
-  eassert (start >= 0 && start <= matrix->nrows);
+  eassert (start >= 0 && (start < matrix->nrows
+                         /* matrix->nrows can be 0 for the initial frame.  */
+                         || (matrix->nrows == 0)));
   eassert (end >= 0 && end <= matrix->nrows);
 
   for (; start < end; ++start)