GraphicsMagick: ReadBlobStream(): Fix EOF logic similar to ReadB...

changeset 5e47c783eb86 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=5e47c783eb86
summary: ReadBlobStream(): Fix EOF logic similar to ReadBlob.

diffstat:

 ChangeLog                              |  7 +++++++
 VisualMagick/installer/inc/version.isx |  4 ++--
 magick/blob.c                          |  2 +-
 magick/version.h                       |  4 ++--
 www/Changelog.html                     |  6 ++++++
 5 files changed, 18 insertions(+), 5 deletions(-)

diffs (67 lines):

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 @@
+2022-01-14  Bob Friesenhahn  <[email protected]>
+
+        * magick/blob.c (ReadBlobStream): Fix EOF logic similar to
+        ReadBlob. Addresses oss-fuzz 43617
+        "graphicsmagick:coder_P7_fuzzer: Use-of-uninitialized-value in
+        WritePNMImage".
+
 2022-01-12  Bob Friesenhahn  <[email protected]>
 
         * 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 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020220112"
-#define public MagickPackageReleaseDate "snapshot-20220112"
+#define public MagickPackageVersionAddendum ".020220114"
+#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 @@
                 (size_t)(blob->length-blob->offset));
   blob->offset+=available;
   blob->read_total += available;
-  if (available == 0)
+  if (available < length)
     {
       blob->eof=True;
       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 @@
 #define MagickLibVersion  0x262300
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 26,23,0
-#define MagickChangeDate   "20220112"
-#define MagickReleaseDate  "snapshot-20220112"
+#define MagickChangeDate   "20220114"
+#define MagickReleaseDate  "snapshot-20220114"
 
 /*
   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 @@
 <div class="document">
 
 
+<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>
+<blockquote>
+* magick/blob.c (ReadBlobStream): Fix EOF logic similar to
+ReadBlob. Addresses oss-fuzz 43617
+&quot;graphicsmagick:coder_P7_fuzzer: Use-of-uninitialized-value in
+WritePNMImage&quot;.</blockquote>
 <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>
 <blockquote>
 <p>* magick/blob.c (ReadBlob): Fix EOF logic. Addresses oss-fuzz