From: Dirk Lemstra <dirk@git.imagemagick.org>
Date: Sat, 26 Aug 2017 20:53:00 +0000 (+0200)
Subject: Fixed Fixed thread safety issue inside the pango and librsvg decoder
X-Git-Tag: 7.0.7-0~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=046709a2b7d4b18b0e738ad10ed789d71c76904e;p=imagemagick

Fixed Fixed thread safety issue inside the pango and librsvg decoder
---

diff --git a/ChangeLog b/ChangeLog
index ff29a1b98..56f4dd7dc 100644
--- 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 c40624e9c..ab2d60927 100644
--- 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 8ee83a2c5..f7ade3a47 100644
--- 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);