From: Alan Third <alan@idiocy.org>
Date: Sat, 25 Jun 2016 23:10:50 +0000 (+0100)
Subject: Prevent NS event loop being re-entered (bug#11049)
X-Git-Tag: emacs-26.0.90~1840^2~99
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee7bc988603ca16e6ef37fbbc377d82db37954c0;p=emacs.git

Prevent NS event loop being re-entered (bug#11049)

* nsterm.m (ns_read_socket, ns_select): Return -1 if already in event
loop instead of aborting.
---

diff --git a/src/nsterm.m b/src/nsterm.m
index bd477a491ff..a6160ed5b2a 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4098,6 +4098,9 @@ ns_read_socket (struct terminal *terminal, struct input_event *hold_quit)
 
   NSTRACE_WHEN (NSTRACE_GROUP_EVENTS, "ns_read_socket");
 
+  if (apploopnr > 0)
+    return -1; /* Already within event loop. */
+
 #ifdef HAVE_NATIVE_FS
   check_native_fs ();
 #endif
@@ -4182,6 +4185,9 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds,
 
   NSTRACE_WHEN (NSTRACE_GROUP_EVENTS, "ns_select");
 
+  if (apploopnr > 0)
+    return -1; /* Already within event loop. */
+
 #ifdef HAVE_NATIVE_FS
   check_native_fs ();
 #endif