From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 11 Dec 2019 17:11:23 +0000 (+0200)
Subject: Avoid infloop in face merging due to bad face spec
X-Git-Tag: emacs-27.0.90~378
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bad2532f664e11e5b32c1194f2274ba2d1f0116b;p=emacs.git

Avoid infloop in face merging due to bad face spec

* src/xfaces.c (face_inherited_attr): Don't infloop if
get_lface_attributes fails in the inner loop.  Reported by
Yuri D'Elia <wavexx@thregr.org>.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 6db4dcd226f..54b5f4a94a4 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -2179,6 +2179,8 @@ face_inherited_attr (struct window *w, struct frame *f,
 	      if (!UNSPECIFIEDP (attr_val))
 		break;
 	    }
+	  if (!ok)	/* bad face? */
+	    break;
 	}
       else
 	{