From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 12 Sep 2012 14:10:42 +0000 (-0700)
Subject: * image.c (jpeg_memory_src): Don't assume string len fits in unsigned.
X-Git-Tag: emacs-24.2.90~310
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=92547ff9d92c77452b6d628a225ecb58b7bb80f9;p=emacs.git

* image.c (jpeg_memory_src): Don't assume string len fits in unsigned.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a005b1d80c7..92394c678ea 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* image.c (jpeg_memory_src): Don't assume string len fits in unsigned.
+
 2012-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* eval.c: Add `inhibit-debugger'.
diff --git a/src/image.c b/src/image.c
index 52598a41ab9..cf01602050f 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6181,7 +6181,7 @@ our_memory_skip_input_data (j_decompress_ptr cinfo, long int num_bytes)
    reading the image.  */
 
 static void
-jpeg_memory_src (j_decompress_ptr cinfo, JOCTET *data, unsigned int len)
+jpeg_memory_src (j_decompress_ptr cinfo, JOCTET *data, ptrdiff_t len)
 {
   struct jpeg_source_mgr *src;