Skip to content

Commit c073a77

Browse files
author
Cristy
committed
https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31161
1 parent a0bcddc commit c073a77

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Diff for: ChangeLog

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2017-01-04 6.9.7-3 Cristy <quetzlzacatenango@image...>
2+
* Increase memory allocation for TIFF pixels (reference
3+
https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31161).
4+
15
2017-01-03 6.9.7-2 Cristy <quetzlzacatenango@image...>
26
* Release ImageMagick version 6.9.7-2, GIT revision 11274:2faf8d7:20170103.
37

Diff for: coders/tiff.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -1606,8 +1606,9 @@ RestoreMSCWarning
16061606
method=ReadTileMethod;
16071607
quantum_info->endian=LSBEndian;
16081608
quantum_type=RGBQuantum;
1609-
tiff_pixels=(unsigned char *) AcquireMagickMemory(TIFFScanlineSize(tiff)+
1610-
sizeof(uint32));
1609+
tiff_pixels=(unsigned char *) AcquireMagickMemory(MagickMax(
1610+
TIFFScanlineSize(tiff),(size_t) (image->columns*samples_per_pixel*
1611+
pow(2.0,ceil(log(bits_per_sample)/log(2.0))))));
16111612
if (tiff_pixels == (unsigned char *) NULL)
16121613
{
16131614
TIFFClose(tiff);

0 commit comments

Comments
 (0)