master bad2532: Avoid infloop in face merging due to bad face spec

[Eli Zaretskii]

branch: master
commit bad2532f664e11e5b32c1194f2274ba2d1f0116b
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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 <address@hidden>.
---
 src/xfaces.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/xfaces.c b/src/xfaces.c
index 6db4dcd..54b5f4a 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
        {