From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 12 Oct 2015 17:02:52 +0000 (+0300)
Subject: Attempt to avoid crashes in plist-member
X-Git-Tag: emacs-25.0.90~1154
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ba156f1e77f22b448ffca72b2ba4dd5ea42ea59;p=emacs.git

Attempt to avoid crashes in plist-member

* src/fns.c (Fplist_member): Don't call QUIT between a CONSP test
and a call to XCDR.  (Bug#21655)
---

diff --git a/src/fns.c b/src/fns.c
index b31bd817c44..dfd48a297a6 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2875,9 +2875,9 @@ The value is actually the tail of PLIST whose car is PROP.  */)
 {
   while (CONSP (plist) && !EQ (XCAR (plist), prop))
     {
-      QUIT;
       plist = XCDR (plist);
       plist = CDR (plist);
+      QUIT;
     }
   return plist;
 }