From: Dirk Lemstra <dirk@git.imagemagick.org>
Date: Sun, 29 Jan 2017 17:51:52 +0000 (+0100)
Subject: Changed check for when the user_info can be used and reverted other fix.
X-Git-Tag: 7.0.4-7~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=998debfaa10ee30e096efbbbf4cfe6355d969fdc;p=imagemagick

Changed check for when the user_info can be used and reverted other fix.
---

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;
 }