From 998debfaa10ee30e096efbbbf4cfe6355d969fdc Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Sun, 29 Jan 2017 18:51:52 +0100 Subject: [PATCH] Changed check for when the user_info can be used and reverted other fix. --- MagickCore/blob.c | 3 ++- MagickCore/image.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MagickCore/blob.c b/MagickCore/blob.c index 1221bc950..4748771fa 100644 --- a/MagickCore/blob.c +++ b/MagickCore/blob.c @@ -2719,7 +2719,8 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info, AttachBlob(image->blob,image_info->blob,image_info->length); return(MagickTrue); } - if (image_info->user_info != (UserBlobInfo *) NULL) + if ((image_info->user_info != (UserBlobInfo *) NULL) && + (*image->filename == '\0')) { image->blob->type=UserStream; image->blob->user_info=image_info->user_info; diff --git a/MagickCore/image.c b/MagickCore/image.c index 9292cc153..48e940b61 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -2918,7 +2918,6 @@ MagickExport void SetImageInfoFile(ImageInfo *image_info,FILE *file) if (image_info->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); - image_info->user_info=(UserBlobInfo *) NULL; image_info->file=file; } -- 2.50.1