• R/O
  • SSH

GM: コミット

Main GraphicsMagick source repository


コミットメタ情報

リビジョン2504f4ed1a52f3ffee013b707c66afa0d8ba7197 (tree)
日時2022-08-05 04:23:15
作者Bob Friesenhahn <bfriesen@Grap...>
コミッターBob Friesenhahn

ログメッセージ

TGA: Remove defective validation of comment length

変更サマリ

差分

diff -r 171c0dd24d8a -r 2504f4ed1a52 ChangeLog
--- a/ChangeLog Sun Jul 31 09:23:17 2022 -0500
+++ b/ChangeLog Thu Aug 04 14:23:15 2022 -0500
@@ -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+
17 2022-07-31 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
28
39 * coders/heif.c: If module is compiled, but HasHEIF is not
diff -r 171c0dd24d8a -r 2504f4ed1a52 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx Sun Jul 31 09:23:17 2022 -0500
+++ b/VisualMagick/installer/inc/version.isx Thu Aug 04 14:23:15 2022 -0500
@@ -10,5 +10,5 @@
1010
1111 #define public MagickPackageName "GraphicsMagick"
1212 #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"
diff -r 171c0dd24d8a -r 2504f4ed1a52 coders/tga.c
--- a/coders/tga.c Sun Jul 31 09:23:17 2022 -0500
+++ b/coders/tga.c Thu Aug 04 14:23:15 2022 -0500
@@ -63,7 +63,7 @@
6363 typedef struct _TGAInfo
6464 {
6565 unsigned char
66- id_length, /* Size of Image ID field */
66+ id_length, /* Size of Image ID field (starting after header) */
6767 colormap_type, /* Color map type */
6868 image_type; /* Image type code */
6969
@@ -219,7 +219,6 @@
219219
220220 const size_t headersize = 15;
221221 unsigned char readbuffer[15];
222- const size_t commentsize = 256;
223222 char commentbuffer[256];
224223 size_t readbufferpos = 0;
225224
@@ -368,8 +367,6 @@
368367 /*
369368 TGA image comment.
370369 */
371- if (((size_t) tga_info.id_length+1) != commentsize)
372- ThrowReaderException(CorruptImageError,ImproperImageHeader,image);
373370 if (ReadBlob(image,tga_info.id_length,commentbuffer) != tga_info.id_length)
374371 ThrowReaderException(CorruptImageError,UnexpectedEndOfFile,image);
375372 commentbuffer[tga_info.id_length]='\0';
diff -r 171c0dd24d8a -r 2504f4ed1a52 magick/version.h
--- a/magick/version.h Sun Jul 31 09:23:17 2022 -0500
+++ b/magick/version.h Thu Aug 04 14:23:15 2022 -0500
@@ -38,8 +38,8 @@
3838 #define MagickLibVersion 0x272400
3939 #define MagickLibVersionText "1.4"
4040 #define MagickLibVersionNumber 27,24,0
41-#define MagickChangeDate "20220731"
42-#define MagickReleaseDate "snapshot-20220731"
41+#define MagickChangeDate "20220804"
42+#define MagickReleaseDate "snapshot-20220804"
4343
4444 /*
4545 The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 171c0dd24d8a -r 2504f4ed1a52 www/Changelog.html
--- a/www/Changelog.html Sun Jul 31 09:23:17 2022 -0500
+++ b/www/Changelog.html Thu Aug 04 14:23:15 2022 -0500
@@ -35,6 +35,11 @@
3535 <div class="document">
3636
3737
38+<p>2022-08-04 Bob Friesenhahn &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</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 &quot;Encyclopedia Of Graphics File Formats&quot; book.</blockquote>
3843 <p>2022-07-31 Bob Friesenhahn &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
3944 <blockquote>
4045 <p>* coders/heif.c: If module is compiled, but HasHEIF is not
旧リポジトリブラウザで表示