From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 30 Oct 2011 20:33:29 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6708
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7178b4eb442d41d9b407e18986024e7ae6d3f25;p=imagemagick

---

diff --git a/coders/meta.c b/coders/meta.c
index 40f496433..ea8ed7078 100644
--- a/coders/meta.c
+++ b/coders/meta.c
@@ -1719,27 +1719,32 @@ iptc_find:
     info_length++;
     if ((c & 0x80) != 0)
       {
+        /*
+          Long format.
+        */
+        tag_length=0;
         for (i=0; i < 4; i++)
         {
-          buffer[i]=(*p++);
+          tag_length<<=8;
+          tag_length|=(*p++);
           length--;
           if (length == 0)
             break;
           info_length++;
         }
-        tag_length=(((size_t) buffer[0]) << 24) |
-          (((size_t) buffer[1]) << 16) |
-          (((size_t) buffer[2]) << 8) | (((size_t) buffer[3])); 
       }
     else
       {
-        tag_length=(size_t) (c << 8);
+        /*
+          Short format.
+        */
+        tag_length=((long) c) << 8;
         c=(*p++);
         length--;
         if (length == 0)
           break;
         info_length++;
-        tag_length|=c;
+        tag_length|=(long) c;
       }
     if (tag_length > (length+1))
       break;