From 703f29d541e099c9f43b1b2877846e12098e7361 Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Fri, 23 Sep 2022 17:14:44 +0200 Subject: [PATCH] Ensure no memory leaks of glyph_matrix ; * src/dispnew.c (allocate_matrices_for_window_redisplay): Allocate each glyph_matrix only when it's NULL. (Bug#58028) --- src/dispnew.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/dispnew.c b/src/dispnew.c index b786f0f1ba4..2568ba1086a 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -1810,9 +1810,12 @@ allocate_matrices_for_window_redisplay (struct window *w) if (w->desired_matrix == NULL) { w->desired_matrix = new_glyph_matrix (NULL); - w->current_matrix = new_glyph_matrix (NULL); + eassert (w->current_matrix == NULL); } + if (w->current_matrix == NULL) + w->current_matrix = new_glyph_matrix (NULL); + dim.width = required_matrix_width (w); dim.height = required_matrix_height (w); adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim); -- 2.39.2