From: Cristy <mikayla-grace@urban-warrior.org>
Date: Sun, 21 Apr 2019 22:52:32 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.8-42~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db0ba30a68d9ffcfe00acb39e22956a78af070b2;p=imagemagick

...
---

diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index 402d20d1b..7b0b0e793 100644
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -70,13 +70,13 @@
 typedef struct _MagicMapInfo
 {
   const char
-    *name;
+    name[10];
 
   const MagickOffsetType
     offset;
 
   const unsigned char
-    *magic;
+    *const magic;
 
   const size_t
     length;
diff --git a/MagickCore/property.c b/MagickCore/property.c
index 3efbb2276..8e63df7cb 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -918,10 +918,10 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
       tag;
 
     const char
-      *description;
+      description[35];
   } TagInfo;
 
-  static TagInfo
+  static const TagInfo
     EXIFTag[] =
     {
       {  0x001, "exif:InteroperabilityIndex" },
@@ -1220,7 +1220,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
       { 0x1001d, "exif:GPSDateStamp" },
       { 0x1001e, "exif:GPSDifferential" },
       { 0x1001f, "exif:GPSHPositioningError" },
-      { 0x00000, (const char *) NULL }
+      { 0x00000, "" }
     };  /* http://www.cipa.jp/std/documents/e/DC-008-Translation-2016-E.pdf */
 
   const StringInfo