avoid deadly embrace for recursive MSL/SVG

Author: Cristy

coders/msl.c

@@ -8064,7 +8064,6 @@ ModuleExport size_t RegisterMSLImage(void)
   entry->encoder=(EncodeImageHandler *) WriteMSLImage;
 #endif
   entry->format_type=ImplicitFormatType;
-  entry->thread_support^=DecoderThreadSupport;
   entry->description=ConstantString("Magick Scripting Language");
   entry->magick_module=ConstantString("MSL");
   (void) RegisterMagickInfo(entry);

coders/svg.c

@@ -3892,7 +3892,6 @@ ModuleExport size_t RegisterSVGImage(void)
   entry->encoder=(EncodeImageHandler *) WriteSVGImage;
   entry->seekable_stream=MagickFalse;
   entry->blob_support=MagickFalse;
-  entry->thread_support^=DecoderThreadSupport;
   entry->description=ConstantString("ImageMagick's own SVG internal renderer");
   entry->magick=(IsImageFormatHandler *) IsSVG;
   entry->magick_module=ConstantString("SVG");

magick/constitute.c

@@ -569,14 +569,14 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
       */
       thread_support=GetMagickThreadSupport(magick_info);
       if ((thread_support & DecoderThreadSupport) == 0)
-        LockSemaphoreInfo(read_info->semaphore);
+        LockSemaphoreInfo(magick_info->semaphore);
       status=IsCoderAuthorized(magick_info->magick_module,read_info->magick,
         ReadPolicyRights,exception);
       image=(Image *) NULL;
       if (status != MagickFalse)
         image=GetImageDecoder(magick_info)(read_info,exception);
       if ((thread_support & DecoderThreadSupport) == 0)
-        UnlockSemaphoreInfo(read_info->semaphore);
+        UnlockSemaphoreInfo(magick_info->semaphore);
     }
   else
     {
@@ -607,11 +607,11 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
         MaxTextExtent);
       *read_info->filename='\0';
       if (GetDelegateThreadSupport(delegate_info) == MagickFalse)
-        LockSemaphoreInfo(read_info->semaphore);
+        LockSemaphoreInfo(delegate_info->semaphore);
       status=InvokeDelegate(read_info,image,read_info->magick,(char *) NULL,
         exception);
       if (GetDelegateThreadSupport(delegate_info) == MagickFalse)
-        UnlockSemaphoreInfo(read_info->semaphore);
+        UnlockSemaphoreInfo(delegate_info->semaphore);
       image=DestroyImageList(image);
       read_info->temporary=MagickTrue;
       if (status != MagickFalse)
@@ -635,14 +635,14 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
       */
       thread_support=GetMagickThreadSupport(magick_info);
       if ((thread_support & DecoderThreadSupport) == 0)
-        LockSemaphoreInfo(read_info->semaphore);
+        LockSemaphoreInfo(magick_info->semaphore);
       status=IsCoderAuthorized(magick_info->magick_module,read_info->magick,
         ReadPolicyRights,exception);
       image=(Image *) NULL;
       if (status != MagickFalse)
         image=(Image *) (GetImageDecoder(magick_info))(read_info,exception);
       if ((thread_support & DecoderThreadSupport) == 0)
-        UnlockSemaphoreInfo(read_info->semaphore);
+        UnlockSemaphoreInfo(magick_info->semaphore);
     }
   if (read_info->temporary != MagickFalse)
     {
@@ -1253,13 +1253,13 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info,
       */
       thread_support=GetMagickThreadSupport(magick_info);
       if ((thread_support & EncoderThreadSupport) == 0)
-        LockSemaphoreInfo(write_info->semaphore);
+        LockSemaphoreInfo(magick_info->semaphore);
       status=IsCoderAuthorized(magick_info->magick_module,write_info->magick,
         WritePolicyRights,exception);
       if (status != MagickFalse)
         status=GetImageEncoder(magick_info)(write_info,image);
       if ((thread_support & EncoderThreadSupport) == 0)
-        UnlockSemaphoreInfo(write_info->semaphore);
+        UnlockSemaphoreInfo(magick_info->semaphore);
     }
   else
     {
@@ -1272,11 +1272,11 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info,
           */
           *write_info->filename='\0';
           if (GetDelegateThreadSupport(delegate_info) == MagickFalse)
-            LockSemaphoreInfo(write_info->semaphore);
+            LockSemaphoreInfo(delegate_info->semaphore);
           status=InvokeDelegate(write_info,image,(char *) NULL,
             write_info->magick,exception);
           if (GetDelegateThreadSupport(delegate_info) == MagickFalse)
-            UnlockSemaphoreInfo(write_info->semaphore);
+            UnlockSemaphoreInfo(delegate_info->semaphore);
           (void) CopyMagickString(image->filename,filename,MaxTextExtent);
         }
       else
@@ -1328,13 +1328,13 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info,
               */
               thread_support=GetMagickThreadSupport(magick_info);
               if ((thread_support & EncoderThreadSupport) == 0)
-                LockSemaphoreInfo(write_info->semaphore);
-              status=IsCoderAuthorized(magick_info->magick_module,
-                write_info->magick,WritePolicyRights,exception);
+                LockSemaphoreInfo(magick_info->semaphore);
+              status=IsCoderAuthorized(magick_info->magick_module,write_info->magick,
+                WritePolicyRights,exception);
               if (status != MagickFalse)
                 status=GetImageEncoder(magick_info)(write_info,image);
               if ((thread_support & EncoderThreadSupport) == 0)
-                UnlockSemaphoreInfo(write_info->semaphore);
+                UnlockSemaphoreInfo(magick_info->semaphore);
             }
         }
     }

magick/image.c

@@ -1287,14 +1287,12 @@ MagickExport ImageInfo *DestroyImageInfo(ImageInfo *image_info)
   if (image_info->authenticate != (char *) NULL)
     image_info->authenticate=DestroyString(
       image_info->authenticate);
+  DestroyImageOptions(image_info);
   if (image_info->cache != (void *) NULL)
     image_info->cache=DestroyPixelCache(image_info->cache);
   if (image_info->profile != (StringInfo *) NULL)
     image_info->profile=(void *) DestroyStringInfo((StringInfo *)
       image_info->profile);
-  DestroyImageOptions(image_info);
-  if (image_info->semaphore != (SemaphoreInfo *) NULL)
-    DestroySemaphoreInfo(&image_info->semaphore);
   image_info->signature=(~MagickCoreSignature);
   image_info=(ImageInfo *) RelinquishMagickMemory(image_info);
   return(image_info);
@@ -1465,7 +1463,6 @@ MagickExport void GetImageInfo(ImageInfo *image_info)
   GetPixelPacketRGBA(TransparentColorRGBA,&image_info->transparent_color);
   image_info->debug=(GetLogEventMask() & ImageEvent) != 0 ? MagickTrue :
     MagickFalse;
-  image_info->semaphore=AllocateSemaphoreInfo();
   image_info->signature=MagickCoreSignature;
 }
 

magick/image.h

@@ -483,9 +483,6 @@ struct _ImageInfo
 
   MagickBooleanType
     synchronize;
-
-  SemaphoreInfo
-    *semaphore;
 };
 
 extern MagickExport ExceptionType