...

diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index 402d20d1b9a40716b250dd852357c4e913f713af..7b0b0e7931956dd190034cfa5768e0af2ab45a77 100644 (file)
--- 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 3efbb22766cb96ac068fc6f47cc1171d852fbaf4..8e63df7cb28cd5a2a15ab3a3587bcf1d33843a11 100644 (file)
--- 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