(image-jpeg-p): Test for APPn markers in the range

#xe0..#xef.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fbbf08c9a84fa848e76953c02ae06b21acb08f1e..2819ebcba553861a04a274e69a14ac4d54c38808 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-10  Gerd Moellmann  <gerd@gnu.org>
+
+       * image.el (image-jpeg-p): Test for APPn markers in the range
+       #xe0..#xef.
+
 2001-08-09  Gerd Moellmann  <gerd@gnu.org>
 
        * desktop.el (desktop-save): Don't use concat to form a file

diff --git a/lisp/image.el b/lisp/image.el
index 3e61b100cee21db840379b4917ad61b6158243e4..f08db3879b11971795bbabffb88ecbb2a12786bc 100644 (file)
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -59,11 +59,12 @@ a non-nil value, TYPE is the image's type ")
          (when (>= (+ i 2) len)
            (throw 'jfif nil))
          (let ((nbytes (+ (lsh (aref data (+ i 1)) 8)
-                          (aref data (+ i 2)))))
-           (when (= (aref data i) #xe0)
+                          (aref data (+ i 2))))
+               (code (aref data i)))
+           (when (and (>= code #xe0) (<= code #xef))
              ;; APP0 LEN1 LEN2 "JFIF\0"
-             (throw 'jfif (string-match "\\`\xe0..JFIF\0" 
-                                        (substring data i (+ i 10)))))
+             (throw 'jfif 
+                    (string-match "JFIF" (substring data i nbytes))))
            (setq i (+ i 1 nbytes))))))))