GraphicsMagick: MontageImages(): Report exception if tile geomet...

changeset 23656d0d72cb in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=23656d0d72cb
summary: MontageImages(): Report exception if tile geometry component is zero

diffstat:

 ChangeLog                              |   7 +++++++
 VisualMagick/installer/inc/version.isx |   4 ++--
 magick/montage.c                       |  13 +++++++++++--
 magick/version.h                       |   4 ++--
 www/Changelog.html                     |  13 +++++++++++--
 5 files changed, 33 insertions(+), 8 deletions(-)

diffs (107 lines):

diff -r 256b021bb7de -r 23656d0d72cb ChangeLog
--- a/ChangeLog	Wed May 31 07:50:23 2023 -0500
+++ b/ChangeLog	Fri Jun 02 19:51:34 2023 -0500
@@ -1,3 +1,10 @@
+2023-06-02  Bob Friesenhahn  <[email protected]>
+
+	* magick/montage.c (MontageImages): Report exception if tile
+	geometry component is zero. Addresses SourceForge issue #699
+	"Floating Point Exception in gm (magick/montage.c:514 in
+	MontageImages)".
+
 2023-05-31  Bob Friesenhahn  <[email protected]>
 
 	* magick/transform.c (ChopImage): Assure that chop image has valid
diff -r 256b021bb7de -r 23656d0d72cb VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Wed May 31 07:50:23 2023 -0500
+++ b/VisualMagick/installer/inc/version.isx	Fri Jun 02 19:51:34 2023 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020230531"
-#define public MagickPackageReleaseDate "snapshot-20230531"
+#define public MagickPackageVersionAddendum ".020230602"
+#define public MagickPackageReleaseDate "snapshot-20230602"
diff -r 256b021bb7de -r 23656d0d72cb magick/montage.c
--- a/magick/montage.c	Wed May 31 07:50:23 2023 -0500
+++ b/magick/montage.c	Fri Jun 02 19:51:34 2023 -0500
@@ -1,5 +1,5 @@
 /*
-% Copyright (C) 2003-2017 GraphicsMagick Group
+% Copyright (C) 2003-2023 GraphicsMagick Group
 % Copyright (C) 2002 ImageMagick Studio
 % Copyright 1991-1999 E. I. du Pont de Nemours and Company
 %
@@ -269,7 +269,7 @@
 
   char
     tile_geometry[MaxTextExtent],
-    *title = 0;
+    *title = (char *) NULL;
 
   const ImageAttribute
     *attribute;
@@ -418,6 +418,15 @@
       /* flags= */ (void) GetGeometry(montage_info->tile,&x,&y,&tiles_per_row,
         &tiles_per_column);
     }
+  if ((0 == tiles_per_row) || (0 == tiles_per_column))
+    {
+      for (tile=0; tile < number_images; tile++)
+        if (image_list[tile])
+          DestroyImage(image_list[tile]);
+      MagickFreeMemory(master_list);
+      ThrowException(exception,OptionError,GeometryDimensionsAreZero,"tile");
+      return((Image *) NULL);
+    }
   /*
     Determine tile sizes.
   */
diff -r 256b021bb7de -r 23656d0d72cb magick/version.h
--- a/magick/version.h	Wed May 31 07:50:23 2023 -0500
+++ b/magick/version.h	Fri Jun 02 19:51:34 2023 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272402
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,2
-#define MagickChangeDate   "20230531"
-#define MagickReleaseDate  "snapshot-20230531"
+#define MagickChangeDate   "20230602"
+#define MagickReleaseDate  "snapshot-20230602"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 256b021bb7de -r 23656d0d72cb www/Changelog.html
--- a/www/Changelog.html	Wed May 31 07:50:23 2023 -0500
+++ b/www/Changelog.html	Fri Jun 02 19:51:34 2023 -0500
@@ -37,6 +37,15 @@
 </div>
 
 <div class="document">
+<p>2023-06-02  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/montage.c (MontageImages): Report exception if tile
+geometry component is zero. Addresses SourceForge issue #699
+&quot;Floating Point Exception in gm (magick/montage.c:514 in
+MontageImages)&quot;.</p></li>
+</ul>
+</blockquote>
 <p>2023-05-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>
 <blockquote>
 <ul>
@@ -46,11 +55,11 @@
 magick/transform.c:1532)&quot; and issue #698 &quot;Assertion <a href="#id3"><span class="problematic" id="id4">`</span></a>image-&gt;rows
 != 0' failed (magick/transform.c:1533 at RollImage)&quot;.</p>
 <div class="system-message" id="id1">
-<p class="system-message-title">System Message: WARNING/2 (<span class="docutils literal">&lt;string&gt;</span>, line 3); <em><a href="#id2">backlink</a></em></p>
+<p class="system-message-title">System Message: WARNING/2 (<span class="docutils literal">&lt;string&gt;</span>, line 10); <em><a href="#id2">backlink</a></em></p>
 <p>Inline interpreted text or phrase reference start-string without end-string.</p>
 </div>
 <div class="system-message" id="id3">
-<p class="system-message-title">System Message: WARNING/2 (<span class="docutils literal">&lt;string&gt;</span>, line 3); <em><a href="#id4">backlink</a></em></p>
+<p class="system-message-title">System Message: WARNING/2 (<span class="docutils literal">&lt;string&gt;</span>, line 10); <em><a href="#id4">backlink</a></em></p>
 <p>Inline interpreted text or phrase reference start-string without end-string.</p>
 </div>
 </li>