ImageMagick-6.9.9-21差分

ImageMagick-6.9.9-20差分 - yoyaのメモの続き

• http://www.imagemagick.org/script/download.php

The latest release of ImageMagick is version 6.9.9-21

• 7 系同時リリースは ImageMagick-7.0.7-9

まとめ

JSON 制御キャラクターをエンコード

差分

• JSON 制御キャラクターをエンコード
  • https://github.com/ImageMagick/ImageMagick/issues/848

ChangeLogにない差分

• coders/pnm.c

160c160
<   for (c='#'; (c != EOF) && (c != (int) '\n'); p++)
---
>   for (c='#'; (c != EOF) && (c != (int) '\n') && (c != (int) '\r'); p++)
210,212c210,213
<   while (isdigit(c) != 0) {
<     if (value > (unsigned int) (INT_MAX/10))
<       break;
---
>   while (isdigit(c) != 0)
>   {
>     if (value <= (unsigned int) (INT_MAX/10))
>       {
214,215c215
<     if (value > (unsigned int) (INT_MAX-(c-(int) '0')))
<       break;
---
>         if (value <= (unsigned int) (INT_MAX-(c-(int) '0')))
216a217
>       }
220a222,223
>   if (c == (int) '#')
>     c=PNMComment(image);
diff -Bwr ImageMagick-6.9.9-21/coders/sfw.c ImageMagick-6.9.9-22/coders/sfw.c
255a256,257
>   if (GetBlobSize(image) < 141)
>     ThrowReaderException(CorruptImageError,"ImproperImageHeader");
273c275,276
<   if (header == (unsigned char *) NULL)
---
>   if ((header == (unsigned char *) NULL) ||
>       ((header+140) > (buffer+GetBlobSize(image))))
diff -Bwr ImageMagick-6.9.9-21/coders/wpg.c ImageMagick-6.9.9-22/coders/wpg.c
514c514,518
<               InsertRow(BImgBuff,y-1,image,bpp);
---
>               if (InsertRow(BImgBuff,y-1,image,bpp) == MagickFalse)
>                 {
>                   BImgBuff=(unsigned char *) RelinquishMagickMemory(BImgBuff);
>                   return(-5);
>                 }
1065a1070,1071
>               if (WPG_Palette.StartIndex > WPG_Palette.NumOfEntries)
>                 ThrowReaderException(CorruptImageError,"InvalidColormapIndex");
1122c1128
<               if ((image->colors == 0) && (bpp <= 16))
---
>               if ((image->storage_class != PseudoClass) && (bpp != 24))
1350c1356,1361
<                         InsertRow(BImgBuff,i,image,bpp);
---
>                       if (InsertRow(BImgBuff,i,image,bpp) == MagickFalse)
>                         {
>                           if(BImgBuff)
>                             BImgBuff=(unsigned char *) RelinquishMagickMemory(BImgBuff);
>                           goto DecompressionFailed;
>                         }

ChangeLog

2017-10-31  6.9.9-21 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 6.9.9-21, GIT revision 12218:43b16fff0:20171031.

2017-10-29  6.9.9-21 Cristy  <quetzlzacatenango@image...>
  * Encode JSON control characters (reference
    https://github.com/ImageMagick/ImageMagick/issues/848).