[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#928478: unblock: graphicsmagick/1.4~hg15978-1



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Hi Release Team,

I ask for an unblock of GraphicsMagick which fixes an uninitialized
variable used in its modules. No RC bugs filed for this and no direct
security impact is known. But I think it's better to be safe.
There's a clang one liner fix as well and a new switch-case for
display the OpenMP specification version in a human readable format.

I let it age a bit and it's a week old now without any regressions.
Debdiff is attached.

Thanks for consideration,
Laszlo/GCS
diff -Nru graphicsmagick-1.4~hg15976/ChangeLog graphicsmagick-1.4~hg15978/ChangeLog
--- graphicsmagick-1.4~hg15976/ChangeLog	2019-04-21 20:43:28.000000000 +0000
+++ graphicsmagick-1.4~hg15978/ChangeLog	2019-04-23 23:31:54.000000000 +0000
@@ -1,3 +1,13 @@
+2019-04-23  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+	* magick/command.c (VersionCommand): Show OpenMP specification
+	version corresponding to version enumeration.
+
+	* magick/locale.c (GetLocaleMessageFromTag): Eliminate clang
+	warning about comparison with a constant value.
+
+	* magick/log.c (InitializeLogInfo): Initialize LogInfo log_configured.
+
 2019-04-21  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
 	* magick/magic.c (struct): Ajust StaticMagic definition to be more
diff -Nru graphicsmagick-1.4~hg15976/debian/changelog graphicsmagick-1.4~hg15978/debian/changelog
--- graphicsmagick-1.4~hg15976/debian/changelog	2019-04-22 14:41:32.000000000 +0000
+++ graphicsmagick-1.4~hg15978/debian/changelog	2019-04-27 07:06:40.000000000 +0000
@@ -1,3 +1,9 @@
+graphicsmagick (1.4~hg15978-1) unstable; urgency=medium
+
+  * Mercurial snapshot, fixing uninitialized integer value of log_configured.
+
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Sat, 27 Apr 2019 07:06:40 +0000
+
 graphicsmagick (1.4~hg15976-1) unstable; urgency=high
 
   * Mercurial snapshot, fixing the following security issues:
diff -Nru graphicsmagick-1.4~hg15976/magick/command.c graphicsmagick-1.4~hg15978/magick/command.c
--- graphicsmagick-1.4~hg15976/magick/command.c	2019-04-21 14:30:42.000000000 +0000
+++ graphicsmagick-1.4~hg15978/magick/command.c	2019-04-23 23:31:03.000000000 +0000
@@ -17031,8 +17031,23 @@
   supported=MagickFalse;
   text[0]='\0';
 #if defined(HAVE_OPENMP)
-  supported=MagickTrue;
-  FormatString(text,"%u",(unsigned int) _OPENMP);
+  {
+    const char *omp_ver;
+    switch((unsigned int) _OPENMP)
+      {
+      case 199810: omp_ver = "1.0"; break; /* 1.0 October 1998 */
+      case 200203: omp_ver = "2.0"; break; /* 2.0 March 2002 */
+      case 200505: omp_ver = "2.5"; break; /* 2.5 May 2005 */
+      case 200805: omp_ver = "3.0"; break; /* 3.0 May, 2008 */
+      case 201107: omp_ver = "3.1"; break; /* 3.1 July 2011 */
+      case 201307: omp_ver = "4.0"; break; /* 4.0 July 2013 */
+      case 201511: omp_ver = "4.5"; break; /* 4.5 Nov 2015 */
+      case 201811: omp_ver = "5.0"; break; /* 5.0 Nov 2018 */
+      default: omp_ver = "?"; break;
+      }
+    supported=MagickTrue;
+    FormatString(text,"%u \"%s\"",(unsigned int) _OPENMP, omp_ver);
+  }
 #endif /* defined(HAVE_OPENMP) */
   PrintFeatureTextual("OpenMP", supported, text);
 
diff -Nru graphicsmagick-1.4~hg15976/magick/locale.c graphicsmagick-1.4~hg15978/magick/locale.c
--- graphicsmagick-1.4~hg15976/magick/locale.c	2019-04-21 20:18:52.000000000 +0000
+++ graphicsmagick-1.4~hg15978/magick/locale.c	2019-04-23 13:37:03.000000000 +0000
@@ -198,7 +198,7 @@
 
   (void) strlcpy(category,tag,MaxTextExtent);
   ChopLocaleComponents(category,2);
-  for (k=0; (k < ArraySize(category_map)) && (category_map[k].name != 0); k++)
+  for (k=0; k < ArraySize(category_map); k++)
     {
       if (LocaleCompare(category,category_map[k].name) == 0)
         {
diff -Nru graphicsmagick-1.4~hg15976/magick/log.c graphicsmagick-1.4~hg15978/magick/log.c
--- graphicsmagick-1.4~hg15976/magick/log.c	2019-04-21 15:03:19.000000000 +0000
+++ graphicsmagick-1.4~hg15978/magick/log.c	2019-04-23 13:33:22.000000000 +0000
@@ -316,6 +316,7 @@
   log_info->output_type=StderrOutput;
 #endif
   log_info->method=0;
+  log_info->log_configured=MagickFalse;
 
   (void) strlcpy(log_info->path,"(default)",sizeof(log_info->path));
   (void) strlcpy(log_info->filename,"Magick-%d.log",sizeof(log_info->filename));
diff -Nru graphicsmagick-1.4~hg15976/magick/version.h graphicsmagick-1.4~hg15978/magick/version.h
--- graphicsmagick-1.4~hg15976/magick/version.h	2019-04-21 20:45:42.000000000 +0000
+++ graphicsmagick-1.4~hg15978/magick/version.h	2019-04-23 23:32:16.000000000 +0000
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x221900
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 22,19,0
-#define MagickChangeDate   "20190421"
-#define MagickReleaseDate  "snapshot-20190421"
+#define MagickChangeDate   "20190423"
+#define MagickReleaseDate  "snapshot-20190423"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -Nru graphicsmagick-1.4~hg15976/www/Changelog.html graphicsmagick-1.4~hg15978/www/Changelog.html
--- graphicsmagick-1.4~hg15976/www/Changelog.html	2019-04-21 20:45:50.000000000 +0000
+++ graphicsmagick-1.4~hg15978/www/Changelog.html	2019-04-23 23:32:24.000000000 +0000
@@ -35,6 +35,16 @@
 <div class="document">
 
 
+<p>2019-04-23  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/command.c (VersionCommand): Show OpenMP specification
+version corresponding to version enumeration.</li>
+<li>magick/locale.c (GetLocaleMessageFromTag): Eliminate clang
+warning about comparison with a constant value.</li>
+<li>magick/log.c (InitializeLogInfo): Initialize LogInfo log_configured.</li>
+</ul>
+</blockquote>
 <p>2019-04-21  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">
diff -Nru graphicsmagick-1.4~hg15976/www/Changelog.rst graphicsmagick-1.4~hg15978/www/Changelog.rst
--- graphicsmagick-1.4~hg15976/www/Changelog.rst	2019-04-21 20:45:42.000000000 +0000
+++ graphicsmagick-1.4~hg15978/www/Changelog.rst	2019-04-23 23:32:16.000000000 +0000
@@ -1,3 +1,13 @@
+2019-04-23  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+  - magick/command.c (VersionCommand): Show OpenMP specification
+    version corresponding to version enumeration.
+
+  - magick/locale.c (GetLocaleMessageFromTag): Eliminate clang
+    warning about comparison with a constant value.
+
+  - magick/log.c (InitializeLogInfo): Initialize LogInfo log\_configured.
+
 2019-04-21  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
   - magick/magic.c (struct): Ajust StaticMagic definition to be more

Reply to: