From: Dirk Lemstra <dirk@lemstra.org>
Date: Sun, 16 Dec 2018 16:54:08 +0000 (+0100)
Subject: Fixed compare and used a constant value for the size of the XMP header.
X-Git-Tag: 7.0.8-17~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7698959d98186b2e6ac0c2e30e4e46cb21d1c20;p=imagemagick

Fixed compare and used a constant value for the size of the XMP header.
---

diff --git a/coders/jpeg.c b/coders/jpeg.c
index 83d4a5939..5ae5b846f 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -179,8 +179,8 @@ typedef struct _QuantizationTable
 */
 static const char
   *xmp_namespace = "http://ns.adobe.com/xap/1.0/ ";
-
-
+#define XmpNamespaceExtent 28
+
 /*
   Forward declarations.
 */
@@ -768,8 +768,8 @@ static boolean ReadProfile(j_decompress_ptr jpeg_info)
       p=GetStringInfoDatum(profile);
       if ((length > 4) && (LocaleNCompare((char *) p,"exif",4) == 0))
         (void) CopyMagickString(name,"exif",MagickPathExtent);
-      if ((length > strlen(xmp_namespace)) &&
-          (LocaleNCompare((char *) p,xmp_namespace,strlen(xmp_namespace)) == 0))
+      if ((length > XmpNamespaceExtent) &&
+          (LocaleNCompare((char *) p,xmp_namespace,XmpNamespaceExtent-1) == 0))
         {
           ssize_t
             j;
@@ -777,8 +777,8 @@ static boolean ReadProfile(j_decompress_ptr jpeg_info)
           /*
             Extract namespace from XMP profile.
           */
-          p=GetStringInfoDatum(profile);
-          for (j=0; j < (ssize_t) GetStringInfoLength(profile); j++)
+          p=GetStringInfoDatum(profile)+XmpNamespaceExtent;
+          for (j=XmpNamespaceExtent; j < (ssize_t) GetStringInfoLength(profile); j++)
           {
             if (*p == '\0')
               break;
@@ -2141,7 +2141,7 @@ static void WriteProfile(j_compress_ptr jpeg_info,Image *image,
           {
             if (profile != (StringInfo *) NULL)
               ConcatenateStringInfo(xmp_profile,profile);
-            GetStringInfoDatum(xmp_profile)[28]='\0';
+            GetStringInfoDatum(xmp_profile)[XmpNamespaceExtent]='\0';
             for (i=0; i < (ssize_t) GetStringInfoLength(xmp_profile); i+=65533L)
             {
               length=MagickMin(GetStringInfoLength(xmp_profile)-i,65533L);