From 8d4c0746ab76d3402cc7d5d866a4827e1b34ffed Mon Sep 17 00:00:00 2001 From: Cristy Date: Sat, 11 Aug 2018 19:45:22 -0400 Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/1245 --- MagickCore/blob.c | 16 +++++++++------- MagickCore/image.c | 2 +- MagickCore/token.c | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/MagickCore/blob.c b/MagickCore/blob.c index 21f1998a0..40146993b 100644 --- a/MagickCore/blob.c +++ b/MagickCore/blob.c @@ -1390,15 +1390,17 @@ MagickExport void *FileToBlob(const char *filename,const size_t extent, "NotAuthorized","`%s'",filename); return(NULL); } - status=GetPathAttributes(filename,&attributes); - if ((status == MagickFalse) || (S_ISDIR(attributes.st_mode) != 0)) - { - ThrowFileException(exception,BlobError,"UnableToReadBlob",filename); - return(NULL); - } file=fileno(stdin); if (LocaleCompare(filename,"-") != 0) - file=open_utf8(filename,O_RDONLY | O_BINARY,0); + { + status=GetPathAttributes(filename,&attributes); + if ((status == MagickFalse) || (S_ISDIR(attributes.st_mode) != 0)) + { + ThrowFileException(exception,BlobError,"UnableToReadBlob",filename); + return(NULL); + } + file=open_utf8(filename,O_RDONLY | O_BINARY,0); + } if (file == -1) { ThrowFileException(exception,BlobError,"UnableToOpenFile",filename); diff --git a/MagickCore/image.c b/MagickCore/image.c index a74ba1118..9fdb83292 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -2936,7 +2936,7 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, } if (image_info->affirm != MagickFalse) return(MagickTrue); - if (frames == 0) + if ((frames == 0) && (*image_info->filename != '\0')) { unsigned char *magick; diff --git a/MagickCore/token.c b/MagickCore/token.c index d5435273d..abddc26b0 100644 --- a/MagickCore/token.c +++ b/MagickCore/token.c @@ -383,7 +383,7 @@ MagickExport MagickBooleanType GlobExpression(const char *expression, image_info=AcquireImageInfo(); (void) CopyMagickString(image_info->filename,pattern,MagickPathExtent); exception=AcquireExceptionInfo(); - (void) SetImageInfo(image_info,1,exception); + (void) SetImageInfo(image_info,0,exception); exception=DestroyExceptionInfo(exception); if (LocaleCompare(image_info->filename,pattern) != 0) { -- 2.40.0