Changeset 6998 for ImageMagick/branches/ImageMagick-6.7.5/magick/profile.c

Timestamp:

02/29/12 20:41:19 (15 months ago)

Author:

cristy

Message:

 

File:

• ImageMagick/branches/ImageMagick-6.7.5/magick/profile.c (modified) (5 diffs)

ImageMagick/branches/ImageMagick-6.7.5/magick/profile.c

@@ -6626 +6626 @@
     number_entries;
 
+  SplayTreeInfo
+    *exif_resources;
+
   ssize_t
     id,
@@ -6687 +6690 @@
   level=0;
   entry=0;
+  exif_resources=NewSplayTree((int (*)(const void *,const void *)) NULL,
+    (void *(*)(void *)) NULL,(void *(*)(void *)) NULL);
   do
   {
@@ -6716 +6721 @@
 
       q=(unsigned char *) (directory+2+(12*entry));
+      if (GetValueFromSplayTree(exif_resources,q) == q)
+        break;
+      (void) AddValueToSplayTree(exif_resources,q,q);
       tag_value=(ssize_t) ReadProfileShort(endian,q);
       format=(ssize_t) ReadProfileShort(endian,q+2);
@@ -6733 +6741 @@
           */
           offset=(ssize_t) ((int) ReadProfileLong(endian,q+8));
+          if ((offset+number_bytes) < offset)
+            continue;  /* prevent overflow */
           if ((size_t) (offset+number_bytes) > length)
             continue;
-          if (~length < number_bytes)
-            continue;  /* prevent overflow */
           p=(unsigned char *) (exif+offset);
         }
@@ -6798 +6806 @@
     }
   } while (level > 0);
+  exif_resources=DestroySplayTree(exif_resources);
   return(MagickTrue);
 }