• R/O
  • SSH

GM: Commit

Main GraphicsMagick source repository


Commit MetaInfo

Revision5e47c783eb86694dfa00429181220cc688f75e74 (tree)
Time2022-01-14 23:42:23
AuthorBob Friesenhahn <bfriesen@Grap...>
CommiterBob Friesenhahn

Log Message

ReadBlobStream(): Fix EOF logic similar to ReadBlob.

Change Summary

Incremental Difference

diff -r 00cac4541812 -r 5e47c783eb86 ChangeLog
--- a/ChangeLog Wed Jan 12 19:14:50 2022 -0600
+++ b/ChangeLog Fri Jan 14 08:42:23 2022 -0600
@@ -1,3 +1,10 @@
1+2022-01-14 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
2+
3+ * magick/blob.c (ReadBlobStream): Fix EOF logic similar to
4+ ReadBlob. Addresses oss-fuzz 43617
5+ "graphicsmagick:coder_P7_fuzzer: Use-of-uninitialized-value in
6+ WritePNMImage".
7+
18 2022-01-12 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
29
310 * magick/blob.c (ReadBlob): Fix EOF logic. Addresses oss-fuzz
diff -r 00cac4541812 -r 5e47c783eb86 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx Wed Jan 12 19:14:50 2022 -0600
+++ b/VisualMagick/installer/inc/version.isx Fri Jan 14 08:42:23 2022 -0600
@@ -10,5 +10,5 @@
1010
1111 #define public MagickPackageName "GraphicsMagick"
1212 #define public MagickPackageVersion "1.4"
13-#define public MagickPackageVersionAddendum ".020220112"
14-#define public MagickPackageReleaseDate "snapshot-20220112"
13+#define public MagickPackageVersionAddendum ".020220114"
14+#define public MagickPackageReleaseDate "snapshot-20220114"
diff -r 00cac4541812 -r 5e47c783eb86 magick/blob.c
--- a/magick/blob.c Wed Jan 12 19:14:50 2022 -0600
+++ b/magick/blob.c Fri Jan 14 08:42:23 2022 -0600
@@ -277,7 +277,7 @@
277277 (size_t)(blob->length-blob->offset));
278278 blob->offset+=available;
279279 blob->read_total += available;
280- if (available == 0)
280+ if (available < length)
281281 {
282282 blob->eof=True;
283283 if (blob->read_limit <= blob->read_total)
diff -r 00cac4541812 -r 5e47c783eb86 magick/version.h
--- a/magick/version.h Wed Jan 12 19:14:50 2022 -0600
+++ b/magick/version.h Fri Jan 14 08:42:23 2022 -0600
@@ -38,8 +38,8 @@
3838 #define MagickLibVersion 0x262300
3939 #define MagickLibVersionText "1.4"
4040 #define MagickLibVersionNumber 26,23,0
41-#define MagickChangeDate "20220112"
42-#define MagickReleaseDate "snapshot-20220112"
41+#define MagickChangeDate "20220114"
42+#define MagickReleaseDate "snapshot-20220114"
4343
4444 /*
4545 The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 00cac4541812 -r 5e47c783eb86 www/Changelog.html
--- a/www/Changelog.html Wed Jan 12 19:14:50 2022 -0600
+++ b/www/Changelog.html Fri Jan 14 08:42:23 2022 -0600
@@ -35,6 +35,12 @@
3535 <div class="document">
3636
3737
38+<p>2022-01-14 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+* magick/blob.c (ReadBlobStream): Fix EOF logic similar to
41+ReadBlob. Addresses oss-fuzz 43617
42+&quot;graphicsmagick:coder_P7_fuzzer: Use-of-uninitialized-value in
43+WritePNMImage&quot;.</blockquote>
3844 <p>2022-01-12 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>
3945 <blockquote>
4046 <p>* magick/blob.c (ReadBlob): Fix EOF logic. Addresses oss-fuzz
Show on old repository browser