(init_from_display_pos): Don't read past end of

[gnu-emacs] / src / xfaces.c

diff --git a/src/xfaces.c b/src/xfaces.c
index c562ce3b5927d231a85d83ff6815dadbf6c16f0b..c02295c7a2726f6125b1fe5abd3a9ad53d72391a 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4148,7 +4148,7 @@ FRAME 0 means change the face on all frames, and change the default
                }
              else if (EQ (k, QCcolor))
                {
-                 if (!STRINGP (v) || SCHARS (v) == 0)
+                 if (!NILP (v) && (!STRINGP (v) || SCHARS (v) == 0))
                    break;
                }
              else if (EQ (k, QCstyle))