[GM-commit] GraphicsMagick: Filenames which start with a colon do not specif...

[GraphicsMagick C. <gra...@li...>]

changeset 33569d74cf0c in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=33569d74cf0c
summary: Filenames which start with a colon do not specify magick

diffstat:

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

diffs (81 lines):

diff -r 4e13433fdfb3 -r 33569d74cf0c ChangeLog
--- a/ChangeLog	Sun Mar 19 09:06:58 2017 -0500
+++ b/ChangeLog	Sun Mar 19 10:13:32 2017 -0500
@@ -1,3 +1,10 @@
+2017-03-19  Bob Friesenhahn  <bfr...@si...>
+
+	* magick/image.c (SetImageInfo): Ignore empty magic prefix
+	specification and do not remove colon character from start of
+	filename.  Resolves SourceForge bug #415 "Inconsistent Behavior w/
+	input_file Parameter".
+
 2017-03-18  Glenn Randers-Pehrson  <gl...@si...>
 
 	* coders/png.c: Added new private orNT PNG chunk, to
diff -r 4e13433fdfb3 -r 33569d74cf0c VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Sun Mar 19 09:06:58 2017 -0500
+++ b/VisualMagick/installer/inc/version.isx	Sun Mar 19 10:13:32 2017 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020170318"
-#define public MagickPackageReleaseDate "snapshot-20170318"
+#define public MagickPackageVersionAddendum ".020170319"
+#define public MagickPackageReleaseDate "snapshot-20170319"
diff -r 4e13433fdfb3 -r 33569d74cf0c magick/image.c
--- a/magick/image.c	Sun Mar 19 09:06:58 2017 -0500
+++ b/magick/image.c	Sun Mar 19 10:13:32 2017 -0500
@@ -2748,7 +2748,8 @@
       p=image_info->filename;
       while (isalnum((int) *p))
         p++;
-      if ((*p == ':') && ((p-image_info->filename) < (long) sizeof(magic)))
+      if ((p != image_info->filename) && (*p == ':') &&
+          ((p-image_info->filename) < (long) sizeof(magic)))
         {
           char
             format[MaxTextExtent];
@@ -2769,6 +2770,9 @@
             (void) strcpy(format,"IMAGE");
 
           LocaleUpper(format);
+          /*
+            If format does not conflict with a Windows logical drive
+          */
           if (!IsMagickConflict(format))
             {
               /*
diff -r 4e13433fdfb3 -r 33569d74cf0c magick/version.h
--- a/magick/version.h	Sun Mar 19 09:06:58 2017 -0500
+++ b/magick/version.h	Sun Mar 19 10:13:32 2017 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x181501
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 18,15,1
-#define MagickChangeDate   "20170318"
-#define MagickReleaseDate  "snapshot-20170318"
+#define MagickChangeDate   "20170319"
+#define MagickReleaseDate  "snapshot-20170319"
 	
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 4e13433fdfb3 -r 33569d74cf0c www/Changelog.html
--- a/www/Changelog.html	Sun Mar 19 09:06:58 2017 -0500
+++ b/www/Changelog.html	Sun Mar 19 10:13:32 2017 -0500
@@ -35,6 +35,15 @@
 <div class="document">
 
 
+<p>2017-03-19  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>magick/image.c (SetImageInfo): Ignore empty magic prefix
+specification and do not remove colon character from start of
+filename.  Resolves SourceForge bug #415 &quot;Inconsistent Behavior w/
+input_file Parameter&quot;.</li>
+</ul>
+</blockquote>
 <p>2017-03-18  Glenn Randers-Pehrson  &lt;<a class="reference external" href="mailto:glennrp&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">glennrp<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
 <ul class="simple">