GraphicsMagick: 3 new changesets

GraphicsMagick Commits <[email protected]> Fri, 29 Nov 2024 09:21:49 -0600
Newsgroups gmane.comp.video.graphicsmagick.cvs
Message-ID <mailman.38015.1732893725.1470.graphicsmagick-commit@lists.sourceforge.net>
changeset 16a415595eab in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=16a415595eab
summary: Also map out gray and rgb raw formats in oss-fuzz build

changeset 323f06e6e652 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=323f06e6e652
summary: Add comment about CoderInfo isRaw() future API/ABI enhancement.

changeset 0d7e54df9d4e in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=0d7e54df9d4e
summary: Also map out cmyk raw formats in oss-fuzz build

diffstat:

 ChangeLog                              |   9 +++++++++
 Magick++/lib/Magick++/CoderInfo.h      |  11 +++++++++++
 VisualMagick/installer/inc/version.isx |   4 ++--
 magick/static.c                        |   6 ++++--
 magick/version.h                       |   4 ++--
 www/ChangeLog.html                     |  11 +++++++++++
 6 files changed, 39 insertions(+), 6 deletions(-)

diffs (123 lines):

diff -r 5502af51b707 -r 0d7e54df9d4e ChangeLog
--- a/ChangeLog	Thu Nov 28 10:53:27 2024 -0600
+++ b/ChangeLog	Fri Nov 29 09:21:03 2024 -0600
@@ -1,3 +1,12 @@
+2024-11-29  Bob Friesenhahn  <[email protected]>
+
+	* magick/static.c (StaticModules): Skip registration of CMYK
+	static module, which is not not useful for oss-fuzz build when
+	FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION is defined.  CMYK, RGB,
+	and GRAY raw format coders require that image dimensions+depth are
+	specified, or else they immediately return an error.  This defeats
+	fuzzing given the current fuzzing driver.
+
 2024-11-28  Bob Friesenhahn  <[email protected]>
 
 	* magick/static.c (StaticModules): Skip registration of static
diff -r 5502af51b707 -r 0d7e54df9d4e Magick++/lib/Magick++/CoderInfo.h
--- a/Magick++/lib/Magick++/CoderInfo.h	Thu Nov 28 10:53:27 2024 -0600
+++ b/Magick++/lib/Magick++/CoderInfo.h	Fri Nov 29 09:21:03 2024 -0600
@@ -52,6 +52,12 @@
     // Format supports multiple frames
     bool isMultiFrame( void ) const;
 
+    // FIXME: For future API/ABI, add support for "isRaw", which means
+    // that size+depth must be specified when reading/writing this
+    // format.
+    //
+    // bool isRaw( void ) const;
+
     // Assignment operator
     CoderInfo& operator= (const CoderInfo &coder_ );
 
@@ -67,6 +73,11 @@
     bool                _isReadable;
     bool                _isWritable;
     bool                _isMultiFrame;
+    // FIXME: For future API/ABI, add support for "isRaw", which means
+    // that size+depth must be specified when reading/writing this
+    // format.
+    //
+    //bool                _isRaw;
 
   };
 } // namespace Magick
diff -r 5502af51b707 -r 0d7e54df9d4e VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Thu Nov 28 10:53:27 2024 -0600
+++ b/VisualMagick/installer/inc/version.isx	Fri Nov 29 09:21:03 2024 -0600
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020241128"
-#define public MagickPackageReleaseDate "snapshot-20241128"
+#define public MagickPackageVersionAddendum ".020241129"
+#define public MagickPackageReleaseDate "snapshot-20241129"
diff -r 5502af51b707 -r 0d7e54df9d4e magick/static.c
--- a/magick/static.c	Thu Nov 28 10:53:27 2024 -0600
+++ b/magick/static.c	Fri Nov 29 09:21:03 2024 -0600
@@ -74,8 +74,8 @@
 #  if defined(HasWINGDI32)
   STATICM("CLIPBOARD",RegisterCLIPBOARDImage,UnregisterCLIPBOARDImage),
 #  endif
+  STATICM("CMYK",RegisterCMYKImage,UnregisterCMYKImage),
 #endif /* if !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) */
-  STATICM("CMYK",RegisterCMYKImage,UnregisterCMYKImage),
   STATICM("CUT",RegisterCUTImage,UnregisterCUTImage),
   STATICM("DCM",RegisterDCMImage,UnregisterDCMImage),
 #if !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
@@ -97,8 +97,8 @@
   STATICM("FPX",RegisterFPXImage,UnregisterFPXImage),
 #endif
   STATICM("GIF",RegisterGIFImage,UnregisterGIFImage),
+#if !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
   STATICM("GRAY",RegisterGRAYImage,UnregisterGRAYImage),
-#if !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
   STATICM("GRADIENT",RegisterGRADIENTImage,UnregisterGRADIENTImage),
   STATICM("HISTOGRAM",RegisterHISTOGRAMImage,UnregisterHISTOGRAMImage),
 #endif /* if !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) */
@@ -179,7 +179,9 @@
   STATICM("PSD",RegisterPSDImage,UnregisterPSDImage),
 #endif /* defined(EnableBrokenCoders) && EnableBrokenCoders */
   STATICM("PWP",RegisterPWPImage,UnregisterPWPImage),
+#if !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
   STATICM("RGB",RegisterRGBImage,UnregisterRGBImage),
+#endif /* if !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) */
   STATICM("RLA",RegisterRLAImage,UnregisterRLAImage),
   STATICM("RLE",RegisterRLEImage,UnregisterRLEImage),
   STATICM("SCT",RegisterSCTImage,UnregisterSCTImage),
diff -r 5502af51b707 -r 0d7e54df9d4e magick/version.h
--- a/magick/version.h	Thu Nov 28 10:53:27 2024 -0600
+++ b/magick/version.h	Fri Nov 29 09:21:03 2024 -0600
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x282502
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 28,25,2
-#define MagickChangeDate   "20241128"
-#define MagickReleaseDate  "snapshot-20241128"
+#define MagickChangeDate   "20241129"
+#define MagickReleaseDate  "snapshot-20241129"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 5502af51b707 -r 0d7e54df9d4e www/ChangeLog.html
--- a/www/ChangeLog.html	Thu Nov 28 10:53:27 2024 -0600
+++ b/www/ChangeLog.html	Fri Nov 29 09:21:03 2024 -0600
@@ -38,6 +38,17 @@
 
 <main id="graphicsmagick-changelog">
 <h1 class="title">GraphicsMagick ChangeLog</h1>
+<p>2024-11-29  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>
+<ul class="simple">
+<li><p>magick/static.c (StaticModules): Skip registration of CMYK
+static module, which is not not useful for oss-fuzz build when
+FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION is defined.  CMYK, RGB,
+and GRAY raw format coders require that image dimensions+depth are
+specified, or else they immediately return an error.  This defeats
+fuzzing given the current fuzzing driver.</p></li>
+</ul>
+</blockquote>
 <p>2024-11-28  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>
 <ul class="simple">