From: Po Lu <luangruo@yahoo.com>
Date: Sun, 22 May 2022 05:13:01 +0000 (+0800)
Subject: Fix use-after-free in x_destroy_window
X-Git-Tag: emacs-29.0.90~1910^2~532
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d52749202f690a50f832c25ddd80929d175e67b4;p=emacs.git

Fix use-after-free in x_destroy_window

* src/xterm.c (x_destroy_window): Fix use after free of the
dpyinfo.
---

diff --git a/src/xterm.c b/src/xterm.c
index 5c2deb62e0d..0487259bf02 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -23397,7 +23397,6 @@ x_destroy_window (struct frame *f)
     x_free_frame_resources (f);
 
   xfree (f->output_data.x->saved_menu_event);
-  xfree (f->output_data.x);
 
 #ifdef HAVE_X_I18N
   if (f->output_data.x->preedit_chars)
@@ -23409,6 +23408,7 @@ x_destroy_window (struct frame *f)
     XFree (f->output_data.x->xi_masks);
 #endif
 
+  xfree (f->output_data.x);
   f->output_data.x = NULL;
 
   dpyinfo->reference_count--;