GraphicsMagick: WriteSUNImage(): Test for sun_info.length overfl...

GraphicsMagick Commits <[email protected]> Fri, 15 Sep 2023 09:59:31 -0500
Newsgroups gmane.comp.video.graphicsmagick.cvs
Message-ID <mailman.858.1694789982.7975.graphicsmagick-commit@lists.sourceforge.net>
changeset f40fc1e9b251 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=f40fc1e9b251
summary: WriteSUNImage(): Test for sun_info.length overflow in a way which should not provoke a compiler warning

diffstat:

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

diffs (69 lines):

diff -r 6b10da4b6a37 -r f40fc1e9b251 ChangeLog
--- a/ChangeLog	Thu Sep 14 15:25:58 2023 -0500
+++ b/ChangeLog	Fri Sep 15 09:59:28 2023 -0500
@@ -1,3 +1,8 @@
+2023-09-15  Bob Friesenhahn  <[email protected]>
+
+	* coders/sun.c (WriteSUNImage): Test for sun_info.length overflow
+	in a way which should not provoke a compiler warning.
+
 2023-09-13  Bob Friesenhahn  <[email protected]>
 
 	* VisualMagick/magick/magick_config.h.in: Block building the XTRN
diff -r 6b10da4b6a37 -r f40fc1e9b251 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Thu Sep 14 15:25:58 2023 -0500
+++ b/VisualMagick/installer/inc/version.isx	Fri Sep 15 09:59:28 2023 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020230913"
-#define public MagickPackageReleaseDate "snapshot-20230913"
+#define public MagickPackageVersionAddendum ".020230915"
+#define public MagickPackageReleaseDate "snapshot-20230915"
diff -r 6b10da4b6a37 -r f40fc1e9b251 coders/sun.c
--- a/coders/sun.c	Thu Sep 14 15:25:58 2023 -0500
+++ b/coders/sun.c	Fri Sep 15 09:59:28 2023 -0500
@@ -1070,9 +1070,9 @@
         (void) LogMagickEvent(CoderEvent,GetMagickModule(),
                               "Bytes per image: %" MAGICK_SIZE_T_F "u",
                               (MAGICK_SIZE_T) bytes_per_image);
-      sun_info.length=bytes_per_image;
-      if (sun_info.length != bytes_per_image)
+      if ((size_t) ((magick_uint32_t) bytes_per_image) != bytes_per_image)
         ThrowWriterException(ResourceLimitError,MemoryAllocationFailed,image);
+      sun_info.length=(magick_uint32_t) bytes_per_image;
 
       /*
         Allocate memory for pixels.
diff -r 6b10da4b6a37 -r f40fc1e9b251 magick/version.h
--- a/magick/version.h	Thu Sep 14 15:25:58 2023 -0500
+++ b/magick/version.h	Fri Sep 15 09:59:28 2023 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272403
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,3
-#define MagickChangeDate   "20230913"
-#define MagickReleaseDate  "snapshot-20230913"
+#define MagickChangeDate   "20230915"
+#define MagickReleaseDate  "snapshot-20230915"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 6b10da4b6a37 -r f40fc1e9b251 www/Changelog.html
--- a/www/Changelog.html	Thu Sep 14 15:25:58 2023 -0500
+++ b/www/Changelog.html	Fri Sep 15 09:59:28 2023 -0500
@@ -37,6 +37,13 @@
 </div>
 
 <div class="document">
+<p>2023-09-15  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>coders/sun.c (WriteSUNImage): Test for sun_info.length overflow
+in a way which should not provoke a compiler warning.</p></li>
+</ul>
+</blockquote>
 <p>2023-09-13  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">