From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 4 Feb 2018 14:32:50 +0000 (-0500)
Subject: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5967
X-Git-Tag: 7.0.7-23~148
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b30dbea8817d45471ec132014a3bc44e05fdf97;p=imagemagick

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5967
---

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 8fd2e58fc..685eabe87 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -1747,6 +1747,13 @@ static MagickBooleanType GetXMPProperty(const Image *image,const char *property)
   xmp_profile=StringInfoToString(profile);
   if (xmp_profile == (char *) NULL)
     return(MagickFalse);
+  if ((strstr(xmp_profile,"<rdf:RDF") == (char *) NULL) ||
+      (strstr(xmp_profile,"<rdf:Description") == (char *) NULL) ||
+      (strstr(xmp_profile,"<x:") == (char *) NULL))
+    {
+      xmp_profile=DestroyString(xmp_profile);
+      return(MagickFalse);
+    }
   for (p=xmp_profile; *p != '\0'; p++)
     if ((*p == '<') && (*(p+1) == 'x'))
       break;
diff --git a/coders/ps.c b/coders/ps.c
index 82e098c3f..6d3ff00d7 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -694,7 +694,8 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
         }
         SetStringInfoLength(profile,i);
-        (void) SetImageProfile(image,"xmp",profile,exception);
+        if (EOFBlob(image) == MagickFalse)
+          (void) SetImageProfile(image,"xmp",profile,exception);
         profile=DestroyStringInfo(profile);
         continue;
       }