| Révision | 2504f4ed1a52f3ffee013b707c66afa0d8ba7197 (tree) |
|---|---|
| l'heure | 2022-08-05 04:23:15 |
| Auteur | Bob Friesenhahn <bfriesen@Grap...> |
| Commiter | Bob Friesenhahn |
TGA: Remove defective validation of comment length
ChangeLog (diff) VisualMagick/installer/inc/version.isx (diff)
coders/tga.c (diff)
magick/version.h (diff)
www/Changelog.html (diff)| @@ -1,3 +1,9 @@ | ||
| 1 | +2022-08-04 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> | |
| 2 | + | |
| 3 | + * coders/tga.c (ReadTGAImage): Remove a defective validation of | |
| 4 | + comment length, which blocked reading some sample TGA files from | |
| 5 | + the "Encyclopedia Of Graphics File Formats" book. | |
| 6 | + | |
| 1 | 7 | 2022-07-31 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> |
| 2 | 8 | |
| 3 | 9 | * coders/heif.c: If module is compiled, but HasHEIF is not |
| @@ -10,5 +10,5 @@ | ||
| 10 | 10 | |
| 11 | 11 | #define public MagickPackageName "GraphicsMagick" |
| 12 | 12 | #define public MagickPackageVersion "1.4" |
| 13 | -#define public MagickPackageVersionAddendum ".020220731" | |
| 14 | -#define public MagickPackageReleaseDate "snapshot-20220731" | |
| 13 | +#define public MagickPackageVersionAddendum ".020220804" | |
| 14 | +#define public MagickPackageReleaseDate "snapshot-20220804" |
| @@ -63,7 +63,7 @@ | ||
| 63 | 63 | typedef struct _TGAInfo |
| 64 | 64 | { |
| 65 | 65 | unsigned char |
| 66 | - id_length, /* Size of Image ID field */ | |
| 66 | + id_length, /* Size of Image ID field (starting after header) */ | |
| 67 | 67 | colormap_type, /* Color map type */ |
| 68 | 68 | image_type; /* Image type code */ |
| 69 | 69 |
| @@ -219,7 +219,6 @@ | ||
| 219 | 219 | |
| 220 | 220 | const size_t headersize = 15; |
| 221 | 221 | unsigned char readbuffer[15]; |
| 222 | - const size_t commentsize = 256; | |
| 223 | 222 | char commentbuffer[256]; |
| 224 | 223 | size_t readbufferpos = 0; |
| 225 | 224 |
| @@ -368,8 +367,6 @@ | ||
| 368 | 367 | /* |
| 369 | 368 | TGA image comment. |
| 370 | 369 | */ |
| 371 | - if (((size_t) tga_info.id_length+1) != commentsize) | |
| 372 | - ThrowReaderException(CorruptImageError,ImproperImageHeader,image); | |
| 373 | 370 | if (ReadBlob(image,tga_info.id_length,commentbuffer) != tga_info.id_length) |
| 374 | 371 | ThrowReaderException(CorruptImageError,UnexpectedEndOfFile,image); |
| 375 | 372 | commentbuffer[tga_info.id_length]='\0'; |
| @@ -38,8 +38,8 @@ | ||
| 38 | 38 | #define MagickLibVersion 0x272400 |
| 39 | 39 | #define MagickLibVersionText "1.4" |
| 40 | 40 | #define MagickLibVersionNumber 27,24,0 |
| 41 | -#define MagickChangeDate "20220731" | |
| 42 | -#define MagickReleaseDate "snapshot-20220731" | |
| 41 | +#define MagickChangeDate "20220804" | |
| 42 | +#define MagickReleaseDate "snapshot-20220804" | |
| 43 | 43 | |
| 44 | 44 | /* |
| 45 | 45 | The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines |
| @@ -35,6 +35,11 @@ | ||
| 35 | 35 | <div class="document"> |
| 36 | 36 | |
| 37 | 37 | |
| 38 | +<p>2022-08-04 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> | |
| 39 | +<blockquote> | |
| 40 | +* coders/tga.c (ReadTGAImage): Remove a defective validation of | |
| 41 | +comment length, which blocked reading some sample TGA files from | |
| 42 | +the "Encyclopedia Of Graphics File Formats" book.</blockquote> | |
| 38 | 43 | <p>2022-07-31 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> |
| 39 | 44 | <blockquote> |
| 40 | 45 | <p>* coders/heif.c: If module is compiled, but HasHEIF is not |
Fork