1 |
Index: /ImageMagick/branches/ImageMagick-6/coders/psd.c
|
2 |
===================================================================
|
3 |
--- /ImageMagick/branches/ImageMagick-6/coders/psd.c (revision 14747)
|
4 |
+++ /ImageMagick/branches/ImageMagick-6/coders/psd.c (revision 14801)
|
5 |
@@ -330,5 +330,5 @@
|
6 |
for (i=0; (packets > 1) && (i < (ssize_t) number_pixels); )
|
7 |
{
|
8 |
- length=(*compact_pixels++);
|
9 |
+ length=(size_t) (*compact_pixels++);
|
10 |
packets--;
|
11 |
if (length == 128)
|
12 |
@@ -337,4 +337,6 @@
|
13 |
{
|
14 |
length=256-length+1;
|
15 |
+ if ((ssize_t) length + i > (ssize_t) number_pixels)
|
16 |
+ length=number_pixels-(size_t) i;
|
17 |
pixel=(*compact_pixels++);
|
18 |
packets--;
|
19 |
@@ -383,4 +385,6 @@
|
20 |
}
|
21 |
length++;
|
22 |
+ if ((ssize_t) length + i > (ssize_t) number_pixels)
|
23 |
+ length=number_pixels-(size_t) i;
|
24 |
for (j=0; j < (ssize_t) length; j++)
|
25 |
{
|