GraphicsMagick: CompositeImageCommand(): Properly deal with -noo...

changeset d010e4255c66 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=d010e4255c66
summary: CompositeImageCommand(): Properly deal with -noop when the user has not provided any images

diffstat:

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

diffs (75 lines):

diff -r 199faf0a0585 -r d010e4255c66 ChangeLog
--- a/ChangeLog	Sat Mar 11 18:11:41 2023 -0600
+++ b/ChangeLog	Sun Mar 12 09:31:12 2023 -0500
@@ -1,3 +1,10 @@
+2023-03-12  Bob Friesenhahn  <[email protected]>
+
+	* magick/command.c (CompositeImageCommand): Properly deal with
+	-noop when the user has not provided any images.  Addresses
+	SourceForge issue #691 "Segmentation Violation in gm
+	(magick/command.c:3054)".
+
 2023-03-11  Bob Friesenhahn  <[email protected]>
 
 	* magick/command.c: Make "operator" parameter checking more
diff -r 199faf0a0585 -r d010e4255c66 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Sat Mar 11 18:11:41 2023 -0600
+++ b/VisualMagick/installer/inc/version.isx	Sun Mar 12 09:31:12 2023 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020230311"
-#define public MagickPackageReleaseDate "snapshot-20230311"
+#define public MagickPackageVersionAddendum ".020230312"
+#define public MagickPackageReleaseDate "snapshot-20230312"
diff -r 199faf0a0585 -r d010e4255c66 magick/command.c
--- a/magick/command.c	Sat Mar 11 18:11:41 2023 -0600
+++ b/magick/command.c	Sun Mar 12 09:31:12 2023 -0500
@@ -3801,8 +3801,12 @@
           break;
         if (LocaleCompare("noop",option+1) == 0)
           {
+            if (image == NULL)
+              ThrowCompositeException(OptionError,NoImagesDefined,
+                                      "no images in composite image list");
+
             status&=CompositeImageList(image_info,&image,composite_image,
-              mask_image,&option_info,exception);
+                                       mask_image,&option_info,exception);
             if (composite_image != (Image *) NULL)
               {
                 DestroyImageList(composite_image);
diff -r 199faf0a0585 -r d010e4255c66 magick/version.h
--- a/magick/version.h	Sat Mar 11 18:11:41 2023 -0600
+++ b/magick/version.h	Sun Mar 12 09:31:12 2023 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272402
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,2
-#define MagickChangeDate   "20230311"
-#define MagickReleaseDate  "snapshot-20230311"
+#define MagickChangeDate   "20230312"
+#define MagickReleaseDate  "snapshot-20230312"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 199faf0a0585 -r d010e4255c66 www/Changelog.html
--- a/www/Changelog.html	Sat Mar 11 18:11:41 2023 -0600
+++ b/www/Changelog.html	Sun Mar 12 09:31:12 2023 -0500
@@ -37,6 +37,15 @@
 </div>
 
 <div class="document">
+<p>2023-03-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>
+<ul class="simple">
+<li><p>magick/command.c (CompositeImageCommand): Properly deal with
+-noop when the user has not provided any images.  Addresses
+SourceForge issue #691 &quot;Segmentation Violation in gm
+(magick/command.c:3054)&quot;.</p></li>
+</ul>
+</blockquote>
 <p>2023-03-11  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">