From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 7 May 2016 20:43:55 +0000 (-0400)
Subject: Less secure coders require explicit reference (e.g. mvg:my-graph.mvg)
X-Git-Tag: 7.0.1-3~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a58ba05cfa4c015969445e15b1823c256672bb1e;p=imagemagick

Less secure coders require explicit reference (e.g. mvg:my-graph.mvg)
---

diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index e87fab792..a9767220a 100644
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -146,7 +146,6 @@ static const MagicMapInfo
     { "MPC", 0, MagicPattern("id=MagickCache") },
     { "MPEG", 0, MagicPattern("\000\000\001\263") },
     { "MRW", 0, MagicPattern("\x00MRM") },
-    { "MVG", 0, MagicPattern("push graphic-context") },
     { "ORF", 0, MagicPattern("IIRO\x08\x00\x00\x00") },
     { "PCD", 2048, MagicPattern("PCD_") },
     { "PCL", 0, MagicPattern("\033E\033") },
diff --git a/coders/msl.c b/coders/msl.c
index 6cad0ef2d..7c7570913 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -7878,6 +7878,7 @@ ModuleExport size_t RegisterMSLImage(void)
   entry->decoder=(DecodeImageHandler *) ReadMSLImage;
   entry->encoder=(EncodeImageHandler *) WriteMSLImage;
 #endif
+  entry->format_type=ImplicitFormatType;
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);
 }
diff --git a/coders/mvg.c b/coders/mvg.c
index cd6b7ad1c..7b09d084b 100644
--- a/coders/mvg.c
+++ b/coders/mvg.c
@@ -250,6 +250,7 @@ ModuleExport size_t RegisterMVGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadMVGImage;
   entry->encoder=(EncodeImageHandler *) WriteMVGImage;
   entry->magick=(IsImageFormatHandler *) IsMVG;
+  entry->format_type=ImplicitFormatType;
   entry->flags^=CoderAdjoinFlag;
   entry->flags|=CoderSeekableStreamFlag;
   (void) RegisterMagickInfo(entry);
diff --git a/coders/txt.c b/coders/txt.c
index 74f7b7647..1245eafca 100644
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -609,8 +609,8 @@ ModuleExport size_t RegisterTXTImage(void)
   entry->flags|=CoderEndianSupportFlag;
   (void) RegisterMagickInfo(entry);
   entry=AcquireMagickInfo("TXT","TEXT","Text");
-  entry->decoder=(DecodeImageHandler *) ReadTXTImage;
-  entry->encoder=(EncodeImageHandler *) WriteTXTImage;
+  entry->decoder=(DecodeImageHandler *) ReadTEXTImage;
+  entry->format_type=ImplicitFormatType;
   entry->flags|=CoderRawSupportFlag;
   entry->flags|=CoderEndianSupportFlag;
   (void) RegisterMagickInfo(entry);