1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/image.el b/lisp/image.el
index 4969f8a4762..7dfa0d4a327 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -208,6 +208,7 @@ compatibility with versions of Emacs that lack the variable
 (defun image-jpeg-p (data)
  "Value is non-nil if DATA, a string, consists of JFIF image data.
 We accept the tag Exif because that is the same format."
+  (setq data (string-to-unibyte data))
  (when (string-match "\\`\xff\xd8" data)
    (catch 'jfif
      (let ((len (length data)) (i 2))

diff --git a/lisp/image.el b/lisp/image.el index 4969f8a4762..7dfa0d4a327 100644 --- a/lisp/image.el +++ b/lisp/image.el
@@ -208,6 +208,7 @@ compatibility with versions of Emacs that lack the variable
208	(defun image-jpeg-p (data)	208	(defun image-jpeg-p (data)
209	"Value is non-nil if DATA, a string, consists of JFIF image data.	209	"Value is non-nil if DATA, a string, consists of JFIF image data.
210	We accept the tag Exif because that is the same format."	210	We accept the tag Exif because that is the same format."
		211	(setq data (string-to-unibyte data))
211	(when (string-match "\\`\xff\xd8" data)	212	(when (string-match "\\`\xff\xd8" data)
212	(catch 'jfif	213	(catch 'jfif
213	(let ((len (length data)) (i 2))	214	(let ((len (length data)) (i 2))