--- imagemagick-6.0.6.2.orig/magick/attribute.c
+++ imagemagick-6.0.6.2/magick/attribute.c
@@ -955,11 +955,11 @@
         }
         if ((t == TAG_EXIF_OFFSET) || (t == TAG_INTEROP_OFFSET))
           {
-            long
+            size_t
               offset;
 
-            offset=(long) ReadUint32(msb_order,pval);
-            if ((offset < (long) length) || (level < (DE_STACK_SIZE-2)))
+            offset=(size_t) ReadUint32(msb_order,pval);
+            if ((offset < length) && (level < (DE_STACK_SIZE-2)))
               {
                 /*
                   Push our current directory state onto the stack.