using ptrdiff_t is recommended for pointer arithmetic in C

ImageMagick · Nov 10, 2024 · 2794ae7 · 2794ae7
1 parent c3bd263
commit 2794ae7
Show file tree

Hide file tree

Showing 67 changed files with 668 additions and 668 deletions.
diff --git a/coders/bmp.c b/coders/bmp.c
@@ -432,7 +432,7 @@ static size_t EncodeImage(Image *image,const size_t bytes_per_line,
           break;
       *q++=(unsigned char) i;
       *q++=(*p);
-      p+=i;
+      p+=(ptrdiff_t) i;
     }
     /*
       End of line.
@@ -1179,7 +1179,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     y=-1;
                     break;
                   }
-                p+=4;
+                p+=(ptrdiff_t) 4;
               }
             }
           }
@@ -2264,7 +2264,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
                   GetPixelBlue(p),31));
               }
             *((unsigned short *) q)=pixel;
-            q+=2;
+            q+=(ptrdiff_t) 2;
             p++;
           }
           for (x=2L*(ssize_t) image->columns; x < (ssize_t) bytes_per_line; x++)

diff --git a/coders/cip.c b/coders/cip.c
@@ -237,7 +237,7 @@ static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image)
          (((size_t) (3*ClampToQuantum(GetPixelLuma(image,p+0))/QuantumRange) & 0x03) << 0));
       (void) FormatLocaleString(buffer,MaxTextExtent,"%02x",byte);
       (void) WriteBlobString(image,buffer);
-      p+=4;
+      p+=(ptrdiff_t) 4;
     }
     if ((image->columns % 4) != 0)
       {

diff --git a/coders/clipboard.c b/coders/clipboard.c
@@ -169,7 +169,7 @@ static Image *ReadCLIPBOARDImage(const ImageInfo *image_info,
       ThrowReaderException(CoderError,"UnableToReadImageData");
     }
   p=(unsigned char *) clip_data;
-  p+=BMP_HEADER_SIZE;
+  p+=(ptrdiff_t) BMP_HEADER_SIZE;
   (void) memcpy(p,clip_mem,clip_size);
   (void) GlobalUnlock(clip_mem);
   (void) CloseClipboard();
@@ -356,7 +356,7 @@ static MagickBooleanType WriteCLIPBOARDImage(const ImageInfo *image_info,
       ThrowWriterException(CoderError,"UnableToWriteImageData");
     }
   p=(unsigned char *) clip_data;
-  p+=BMP_HEADER_SIZE;
+  p+=(ptrdiff_t) BMP_HEADER_SIZE;
   (void) memcpy(clip_mem,p,length-BMP_HEADER_SIZE);
   (void) GlobalUnlock(clip_mem);
   clip_data=RelinquishMagickMemory(clip_data);

diff --git a/coders/dcm.c b/coders/dcm.c
@@ -3674,7 +3674,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 else
                   index=(unsigned short) (*p | (*(p+1) << 8));
                 redmap[i]=(int) index;
-                p+=2;
+                p+=(ptrdiff_t) 2;
               }
               break;
             }
@@ -3706,7 +3706,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 else
                   index=(unsigned short) (*p | (*(p+1) << 8));
                 greenmap[i]=(int) index;
-                p+=2;
+                p+=(ptrdiff_t) 2;
               }
               break;
             }
@@ -3738,7 +3738,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 else
                   index=(unsigned short) (*p | (*(p+1) << 8));
                 bluemap[i]=(int) index;
-                p+=2;
+                p+=(ptrdiff_t) 2;
               }
               break;
             }

diff --git a/coders/dib.c b/coders/dib.c
@@ -381,7 +381,7 @@ static size_t EncodeImage(Image *image,const size_t bytes_per_line,
           break;
       *q++=(unsigned char) i;
       *q++=(*p);
-      p+=i;
+      p+=(ptrdiff_t) i;
     }
     /*
       End of line.

diff --git a/coders/fits.c b/coders/fits.c
@@ -347,7 +347,7 @@ static Image *ReadFITSImage(const ImageInfo *image_info,
         p=value;
         if (*p == '=')
           {
-            p+=2;
+            p+=(ptrdiff_t) 2;
             while (isspace((int) ((unsigned char) *p)) != 0)
               p++;
           }

diff --git a/coders/fpx.c b/coders/fpx.c
@@ -494,7 +494,7 @@ static Image *ReadFPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
       if (image->matte != MagickFalse)
         SetPixelAlpha(q,ScaleCharToQuantum(*a));
       q++;
-      r+=red_component->columnStride;
+      r+=(ptrdiff_t) red_component->columnStride;
       g+=green_component->columnStride;
       b+=blue_component->columnStride;
       a+=alpha_component->columnStride;

diff --git a/coders/hdr.c b/coders/hdr.c
@@ -456,7 +456,7 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception)
                         count=ReadBlob(image,(size_t) count*sizeof(*p),p);
                         if (count < 1)
                           break;
-                        p+=count;
+                        p+=(ptrdiff_t) count;
                       }
                   }
               }
@@ -628,7 +628,7 @@ static size_t HDRWriteRunlengthPixels(Image *image,unsigned char *pixels)
     previous_count=0;
     while ((runlength < MinimumRunlength) && (q < image->columns))
     {
-      q+=runlength;
+      q+=(ptrdiff_t) runlength;
       previous_count=(ssize_t) runlength;
       runlength=1;
       while ((pixels[q] == pixels[q+runlength]) &&
@@ -653,15 +653,15 @@ static size_t HDRWriteRunlengthPixels(Image *image,unsigned char *pixels)
         break;
       if (WriteBlob(image,(size_t) count*sizeof(*pixel),&pixels[p]) < 1)
         break;
-      p+=count;
+      p+=(ptrdiff_t) count;
     }
     if (runlength >= MinimumRunlength)
       {
         pixel[0]=(unsigned char) (128+runlength);
         pixel[1]=pixels[q];
         if (WriteBlob(image,2*sizeof(*pixel),pixel) < 1)
           break;
-        p+=runlength;
+        p+=(ptrdiff_t) runlength;
       }
   }
   return(p);

diff --git a/coders/heic.c b/coders/heic.c
@@ -548,15 +548,15 @@ static MagickBooleanType ReadHEICImageHandle(const ImageInfo *image_info,
       for (x=0; x < (ssize_t) image->columns; x++)
       {
         unsigned short pixel = (((unsigned short) *(p+1) << 8) |
-          (*(p+0))) << shift; p+=2;
+          (*(p+0))) << shift; p+=(ptrdiff_t) 2;
         SetPixelRed(q,ScaleShortToQuantum(pixel));
-        pixel=(((unsigned short) *(p+1) << 8) | (*(p+0))) << shift; p+=2;
+        pixel=(((unsigned short) *(p+1) << 8) | (*(p+0))) << shift; p+=(ptrdiff_t) 2;
         SetPixelGreen(q,ScaleShortToQuantum(pixel));
-        pixel=(((unsigned short) *(p+1) << 8) | (*(p+0))) << shift; p+=2;
+        pixel=(((unsigned short) *(p+1) << 8) | (*(p+0))) << shift; p+=(ptrdiff_t) 2;
         SetPixelBlue(q,ScaleShortToQuantum(pixel));
         if (image->matte != MagickFalse)
           {
-            pixel=(((unsigned short) *(p+1) << 8) | (*(p+0))) << shift; p+=2;
+            pixel=(((unsigned short) *(p+1) << 8) | (*(p+0))) << shift; p+=(ptrdiff_t) 2;
             SetPixelAlpha(q,ScaleShortToQuantum(pixel));
           }
         q++;

diff --git a/coders/jbig.c b/coders/jbig.c
@@ -199,7 +199,7 @@ static Image *ReadJBIGImage(const ImageInfo *image_info,
         count;
 
       status=jbg_dec_in(&jbig_info,p,length,&count);
-      p+=count;
+      p+=(ptrdiff_t) count;
       length-=(ssize_t) count;
     }
   } while ((status == JBG_EAGAIN) || (status == JBG_EOK));

diff --git a/coders/json.c b/coders/json.c
@@ -300,7 +300,7 @@ static void JSONFormatLocaleFile(FILE *file,const char *format,
         if (((int) *p >= 0x00) && ((int) *p <= 0x1f))
           {
             (void) FormatLocaleString(q,7,"\\u%04X",(int) *p);
-            q+=6;
+            q+=(ptrdiff_t) 6;
             break;
           }
         *q++=(*p);

diff --git a/coders/meta.c b/coders/meta.c
@@ -1682,23 +1682,23 @@ static size_t GetIPTCStream(unsigned char **info,size_t length)
   {
     if (strncmp((const char *) p,"8BIM",4))
       break;
-    p+=4;
+    p+=(ptrdiff_t) 4;
     extent-=4;
     marker=(unsigned int) (*p) << 8 | *(p+1);
-    p+=2;
+    p+=(ptrdiff_t) 2;
     extent-=2;
     c=*p++;
     extent--;
     c|=0x01;
     if ((size_t) c >= extent)
       break;
-    p+=c;
+    p+=(ptrdiff_t) c;
     extent-=c;
     if (extent < 4)
       break;
     tag_length=(((size_t) *p) << 24) | (((size_t) *(p+1)) << 16) |
       (((size_t) *(p+2)) << 8) | ((size_t) *(p+3));
-    p+=4;
+    p+=(ptrdiff_t) 4;
     extent-=4;
     if (tag_length > extent)
       break;
@@ -1709,7 +1709,7 @@ static size_t GetIPTCStream(unsigned char **info,size_t length)
       }
     if ((tag_length & 0x01) != 0)
       tag_length++;
-    p+=tag_length;
+    p+=(ptrdiff_t) tag_length;
     extent-=tag_length;
   }
   /*
@@ -1806,7 +1806,7 @@ static size_t GetIPTCStream(unsigned char **info,size_t length)
       }
     if (tag_length > (length+1))
       break;
-    p+=tag_length;
+    p+=(ptrdiff_t) tag_length;
     length-=tag_length;
     if (length == 0)
       break;

diff --git a/coders/miff.c b/coders/miff.c
@@ -227,14 +227,14 @@ static void PushRunlengthPacket(Image *image,const unsigned char *pixels,
           *index=ConstrainColormapIndex(image,(ssize_t) (((size_t) *p << 24) |
             ((size_t) *(p+1) << 16) | ((size_t) *(p+2) << 8) |
             (size_t) *(p+3)));
-          p+=4;
+          p+=(ptrdiff_t) 4;
           break;
         }
         case 16:
         {
           *index=ConstrainColormapIndex(image,(ssize_t) ((size_t) (*p << 8) |
             (size_t) *(p+1)));
-          p+=2;
+          p+=(ptrdiff_t) 2;
           break;
         }
         case 8:

diff --git a/coders/pcd.c b/coders/pcd.c
@@ -468,9 +468,9 @@ static void Upsample(const size_t width,const size_t height,
       *q=(unsigned char) ((((size_t) *p)+((size_t) *r)+1) >> 1);
       *(q+1)=(unsigned char) ((((size_t) *p)+((size_t) *(p+2))+
         ((size_t) *r)+((size_t) *(r+2))+2) >> 2);
-      q+=2;
-      p+=2;
-      r+=2;
+      q+=(ptrdiff_t) 2;
+      p+=(ptrdiff_t) 2;
+      r+=(ptrdiff_t) 2;
     }
     *q++=(unsigned char) ((((size_t) *p++)+((size_t) *r++)+1) >> 1);
     *q++=(unsigned char) ((((size_t) *p++)+((size_t) *r++)+1) >> 1);

diff --git a/coders/pcx.c b/coders/pcx.c
@@ -538,7 +538,7 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 break;
               }
             }
-            r+=pcx_info.planes;
+            r+=(ptrdiff_t) pcx_info.planes;
           }
         }
       else

diff --git a/coders/pict.c b/coders/pict.c
@@ -526,7 +526,7 @@ static unsigned char *DecodeImage(Image *blob,Image *image,
             &number_pixels);
           if ((q-pixels+number_pixels) <= *extent)
             (void) memcpy(q,p,(size_t) number_pixels);
-          q+=number_pixels;
+          q+=(ptrdiff_t) number_pixels;
           j+=(ssize_t) (length*bytes_per_pixel+1);
         }
       else
@@ -539,7 +539,7 @@ static unsigned char *DecodeImage(Image *blob,Image *image,
           {
             if ((q-pixels+number_pixels) <= *extent)
               (void) memcpy(q,p,(size_t) number_pixels);
-            q+=number_pixels;
+            q+=(ptrdiff_t) number_pixels;
           }
           j+=(ssize_t) bytes_per_pixel+1;
         }
@@ -1354,7 +1354,7 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
               if ((tile_image->storage_class == DirectClass) &&
                   (pixmap.bits_per_pixel != 16))
                 {
-                  p+=(pixmap.component_count-1)*tile_image->columns;
+                  p+=(ptrdiff_t) (pixmap.component_count-1)*tile_image->columns;
                   if (p < pixels)
                     break;
                 }

diff --git a/coders/png.c b/coders/png.c
@@ -1993,7 +1993,7 @@ static int read_user_chunk_callback(png_struct *ping, png_unknown_chunkp chunk)
           if (s[0] == 'E' && s[1] == 'x'  && s[2] == 'i' &&
               s[3] == 'f' && s[4] == '\0' && s[5] == '\0')
           {
-            s+=6;
+            s+=(ptrdiff_t) 6;
             i=6;
             SetStringInfoLength(profile,chunk->size);
             p=GetStringInfoDatum(profile);
@@ -5482,7 +5482,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
                   "  MNG height: %.20g",(double) mng_info->mng_height);
               }
 
-            p+=8;
+            p+=(ptrdiff_t) 8;
             mng_info->ticks_per_second=(size_t) mng_get_long(p);
 
             if (mng_info->ticks_per_second == 0)
@@ -5496,7 +5496,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
             simplicity=0;
 
             /* Skip nominal layer count, frame count, and play time */
-            p+=16;
+            p+=(ptrdiff_t) 16;
             simplicity=(size_t) mng_get_long(p);
 
             mng_type=1;    /* Full MNG */
@@ -5900,7 +5900,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
                         if (change_delay == 2)
                           default_frame_delay=frame_delay;
 
-                        p+=4;
+                        p+=(ptrdiff_t) 4;
 
                         if (logging != MagickFalse)
                           (void) LogMagickEvent(CoderEvent,GetMagickModule(),
@@ -5921,7 +5921,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
                         if (change_timeout == 2)
                           default_frame_timeout=frame_timeout;
 
-                        p+=4;
+                        p+=(ptrdiff_t) 4;
 
                         if (logging != MagickFalse)
                           (void) LogMagickEvent(CoderEvent,GetMagickModule(),
@@ -5931,7 +5931,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
                     if (change_clipping && ((p-chunk) < (ssize_t) (length-16)))
                       {
                         fb=mng_read_box(previous_fb,(char) p[0],&p[1]);
-                        p+=16;
+                        p+=(ptrdiff_t) 16;
                         previous_fb=fb;
 
                         if (logging != MagickFalse)
@@ -6026,7 +6026,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
               {
                 first_object=(p[0] << 8) | p[1];
                 last_object=(p[2] << 8) | p[3];
-                p+=4;
+                p+=(ptrdiff_t) 4;
 
                 for (i=(int) first_object; i <= (int) last_object; i++)
                 {
@@ -6104,7 +6104,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
             {
               first_object=(p[0] << 8) | p[1];
               last_object=(p[2] << 8) | p[3];
-              p+=4;
+              p+=(ptrdiff_t) 4;
 
               for (i=(ssize_t) first_object; i <= (ssize_t) last_object; i++)
               {
@@ -6981,7 +6981,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
                       1,exception);
                     if (q == (PixelPacket *) NULL)
                       break;
-                    q+=(large_image->columns-image->columns);
+                    q+=(ptrdiff_t) (large_image->columns-image->columns);
 
                     for (x=(ssize_t) image->columns-1; x >= 0; x--)
                     {
@@ -13145,7 +13145,7 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info,
                 (((unsigned int) *(p + 1) & 0xff) << 16) +
                 (((unsigned int) *(p + 2) & 0xff) <<  8) +
                 (((unsigned int) *(p + 3) & 0xff)      ) ;
-            p+=4;
+            p+=(ptrdiff_t) 4;
 
             if (*(p)==73 && *(p+1)==68 && *(p+2)==65 && *(p+3)==84) /* IDAT */
               {
@@ -13163,7 +13163,7 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info,
                     "    Skipping %c%c%c%c chunk, length=%.20g.",
                     *(p),*(p+1),*(p+2),*(p+3),(double) len);
               }
-            p+=(8+len);
+            p+=(ptrdiff_t) (8+len);
           }
         }
       else if (length != 0)
-Original file line number
+Diff line change
@@ Expand Up @@
                     break;
                   }
                 }
-                r+=pcx_info.planes;
+                r+=(ptrdiff_t) pcx_info.planes;
               }
             }
           else
@@ Expand Down @@