]> granicus.if.org Git - imagemagick/commitdiff
Eliminate hang on stdin
authorCristy <urban-warrior@imagemagick.org>
Fri, 9 Feb 2018 01:21:43 +0000 (20:21 -0500)
committerCristy <urban-warrior@imagemagick.org>
Fri, 9 Feb 2018 01:21:43 +0000 (20:21 -0500)
MagickCore/draw.c

index 029cb904d642ba37d9fff67b234ff2d4f272e660..6f6f6860b2959a27367630f8f17a549fc5bd2972 100644 (file)
@@ -1749,10 +1749,12 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
     return(MagickFalse);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(DrawEvent,GetMagickModule(),"begin draw-image");
+  primitive=(char *) NULL;
   if (*draw_info->primitive != '@')
     primitive=AcquireString(draw_info->primitive);
   else
-    primitive=FileToString(draw_info->primitive+1,~0UL,exception);
+    if (*(draw_info->primitive+1) != '-')
+      primitive=FileToString(draw_info->primitive+1,~0UL,exception);
   if (primitive == (char *) NULL)
     return(MagickFalse);
   primitive_extent=(double) strlen(primitive);