Fixed Fixed thread safety issue inside the pango and librsvg decoder

diff --git a/ChangeLog b/ChangeLog
index ff29a1b98d2467fdc5df30903b5bcae9aa235bb3..56f4dd7dcf171f2ffca3b9d0e20509cccc5e36a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-08-26  7.0.6-10 Dirk Lemstra <dirk@lem.....org>
+  * Fixed thread safety issue inside the pango and librsvg decoder
+    (reference: https://github.com/dlemstra/Magick.NET/issues/91).
+
 2017-08-20  7.0.6-9 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.6-9, GIT revision 20860:3f307d8ad:20170820.
 

diff --git a/coders/pango.c b/coders/pango.c
index c40624e9cce4149f49c8cee1d3980554ae6f3b27..ab2d60927eb113a8b645d274ffe6419697c19090 100644 (file)
--- a/coders/pango.c
+++ b/coders/pango.c
@@ -507,6 +507,7 @@ ModuleExport size_t RegisterPANGOImage(void)
   if (*version != '\0')
     entry->version=ConstantString(version);
   entry->flags^=CoderAdjoinFlag;
+  entry->flags^=CoderDecoderThreadSupportFlag;
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);
 }

diff --git a/coders/svg.c b/coders/svg.c
index 8ee83a2c5c061d23b549fe8a5df4fe5940e3fcbc..f7ade3a478ba57bc90e203fc863203a46b04f177 100644 (file)
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -3346,6 +3346,9 @@ ModuleExport size_t RegisterSVGImage(void)
 #endif
   entry->encoder=(EncodeImageHandler *) WriteSVGImage;
   entry->flags^=CoderBlobSupportFlag;
+#if defined(MAGICKCORE_RSVG_DELEGATE)
+  entry->flags^=CoderDecoderThreadSupportFlag;
+#endif
   entry->mime_type=ConstantString("image/svg+xml");
   if (*version != '\0')
     entry->version=ConstantString(version);
@@ -3357,6 +3360,9 @@ ModuleExport size_t RegisterSVGImage(void)
 #endif
   entry->encoder=(EncodeImageHandler *) WriteSVGImage;
   entry->flags^=CoderBlobSupportFlag;
+#if defined(MAGICKCORE_RSVG_DELEGATE)
+  entry->flags^=CoderDecoderThreadSupportFlag;
+#endif
   entry->mime_type=ConstantString("image/svg+xml");
   if (*version != '\0')
     entry->version=ConstantString(version);
@@ -3369,6 +3375,9 @@ ModuleExport size_t RegisterSVGImage(void)
 #endif
   entry->encoder=(EncodeImageHandler *) WriteSVGImage;
   entry->flags^=CoderBlobSupportFlag;
+#if defined(MAGICKCORE_RSVG_DELEGATE)
+  entry->flags^=CoderDecoderThreadSupportFlag;
+#endif
   entry->magick=(IsImageFormatHandler *) IsSVG;
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);