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 6db4dcd226fcc2f7f2766d9d2507a0478ba494f5..54b5f4a94a42c27eb732cb1c7d9e4f17b107ddfb 100644 (file)
--- 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
        {