From 06afa7b4e096b14d03cc801235b27395a9857272 Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Mon, 4 Jul 2022 09:33:19 +0800
Subject: [PATCH] Add some more error checking code to `x_stop_ignoring_errors'

* src/xterm.c (x_stop_ignoring_errors): Abort if no request was
actually made, making the state inconsistent.
---
 src/xterm.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/xterm.c b/src/xterm.c
index dc7e3283a5c..02ea968031e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -23139,6 +23139,13 @@ x_stop_ignoring_errors (struct x_display_info *dpyinfo)
 
   range = dpyinfo->next_failable_request - 1;
   range->end = XNextRequest (dpyinfo->display) - 1;
+
+  /* Abort if no request was made since
+     `x_ignore_errors_for_next_request'.  */
+
+  if (X_COMPARE_SERIALS (range->end, <,
+			 range->start))
+    emacs_abort ();
 }
 
 /* Undo the last x_catch_errors call.
-- 
2.39.2