diff options
| author | Paul Eggert | 2012-09-12 07:10:42 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-09-12 07:10:42 -0700 |
| commit | 92547ff9d92c77452b6d628a225ecb58b7bb80f9 (patch) | |
| tree | 741576b229e236e144c90fbb3ba1a8bcb96cd02b /src | |
| parent | 44677e307235c9c0f58a78d6af56b8bb2750e939 (diff) | |
| download | emacs-92547ff9d92c77452b6d628a225ecb58b7bb80f9.tar.gz emacs-92547ff9d92c77452b6d628a225ecb58b7bb80f9.zip | |
* image.c (jpeg_memory_src): Don't assume string len fits in unsigned.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/image.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a005b1d80c7..92394c678ea 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-09-12 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * image.c (jpeg_memory_src): Don't assume string len fits in unsigned. | ||
| 4 | |||
| 1 | 2012-09-12 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2012-09-12 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * eval.c: Add `inhibit-debugger'. | 7 | * 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) | |||
| 6181 | reading the image. */ | 6181 | reading the image. */ |
| 6182 | 6182 | ||
| 6183 | static void | 6183 | static void |
| 6184 | jpeg_memory_src (j_decompress_ptr cinfo, JOCTET *data, unsigned int len) | 6184 | jpeg_memory_src (j_decompress_ptr cinfo, JOCTET *data, ptrdiff_t len) |
| 6185 | { | 6185 | { |
| 6186 | struct jpeg_source_mgr *src; | 6186 | struct jpeg_source_mgr *src; |
| 6187 | 6187 | ||