From: Gerd Moellmann <gerd@gnu.org>
Date: Tue, 24 Jul 2001 11:28:18 +0000 (+0000)
Subject: (valid_image_p): Protect better against invalid image
X-Git-Tag: emacs-pretest-21.0.105~402
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1783ffa26e0a54c54841cc84d309365cf4dd89d5;p=emacs.git

(valid_image_p): Protect better against invalid image
specifications.
---

diff --git a/src/xfns.c b/src/xfns.c
index 0d66c03e235..0d71a16fa6a 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;