Skip to content

Commit 139277a

Browse files
author
Cristy
committed
https://github.com/ImageMagick/ImageMagick/issues/8557
1 parent 98c2bb3 commit 139277a

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

coders/pwp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ static Image *ReadPWPImage(const ImageInfo *image_info,ExceptionInfo *exception)
227227
}
228228
length=fwrite("SFW94A",1,6,file);
229229
(void) length;
230-
filesize=65535UL*magick[2]+256L*magick[1]+magick[0];
230+
filesize=65535*magick[2]+256L*magick[1]+magick[0];
231231
for (i=0; i < (ssize_t) filesize; i++)
232232
{
233233
c=ReadBlobByte(pwp_image);

coders/stegano.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ static Image *ReadSTEGANOImage(const ImageInfo *image_info,
212212
if (c == 3)
213213
c=0;
214214
k++;
215-
if (k == (ssize_t) (watermark->columns*watermark->columns))
215+
if (k == (ssize_t) (watermark->columns*watermark->rows))
216216
k=0;
217217
if (k == image->offset)
218218
j++;

coders/xpm.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,12 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception)
445445
else
446446
(void) CopyMagickString(target,q,MaxTextExtent);
447447
q=ParseXPMColor(target,MagickFalse);
448-
(void) CopyXPMColor(symbolic,q,MagickMin((size_t) (next-q),
449-
MagickPathExtent-1));
450448
if (q != (char *) NULL)
451-
*q='\0';
449+
{
450+
(void) CopyXPMColor(symbolic,q,MagickMin((size_t) (next-q),
451+
MagickPathExtent-1));
452+
*q='\0';
453+
}
452454
}
453455
StripString(target);
454456
if (*symbolic != '\0')

0 commit comments

Comments
 (0)