From 1783ffa26e0a54c54841cc84d309365cf4dd89d5 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Tue, 24 Jul 2001 11:28:18 +0000 Subject: [PATCH] (valid_image_p): Protect better against invalid image specifications. --- src/xfns.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/xfns.c b/src/xfns.c index 0d66c03e23..0d71a16fa6 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -5318,11 +5318,22 @@ valid_image_p (object) if (CONSP (object) && EQ (XCAR (object), Qimage)) { - Lisp_Object symbol = Fplist_get (XCDR (object), QCtype); - struct image_type *type = lookup_image_type (symbol); - - if (type) - valid_p = type->valid_p (object); + Lisp_Object tem; + + for (tem = XCDR (object); CONSP (tem); tem = XCDR (tem)) + if (EQ (XCAR (tem), QCtype)) + { + tem = XCDR (tem); + if (CONSP (tem) && SYMBOLP (XCAR (tem))) + { + struct image_type *type; + type = lookup_image_type (XCAR (tem)); + if (type) + valid_p = type->valid_p (object); + } + + break; + } } return valid_p; -- 2.20.1