Use MagickPathExtent instead of MaxTextExtent.

ImageMagick · Apr 11, 2021 · 0ec3f15 · 0ec3f15
1 parent b04526a
commit 0ec3f15
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 33 deletions.
diff --git a/MagickCore/animate.c b/MagickCore/animate.c
@@ -1981,7 +1981,7 @@ MagickExport Image *XAnimateImages(Display *display,
     else
       {
         char
-          window_name[MaxTextExtent];
+          window_name[MagickPathExtent];
 
         p=image_list[scene]->magick_filename+
           strlen(image_list[scene]->magick_filename)-1;
@@ -2101,7 +2101,7 @@ MagickExport Image *XAnimateImages(Display *display,
               (resource_info->title != (char *) NULL))
             {
               char
-                name[MaxTextExtent];
+                name[MagickPathExtent];
 
               /*
                 Update window title.

diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
@@ -919,7 +919,7 @@ static char *InterpretDelegateProperties(ImageInfo *image_info,
     { \
       extent+=length; \
       interpret_text=(char *) ResizeQuantumMemory(interpret_text,extent+ \
-        MaxTextExtent,sizeof(*interpret_text)); \
+        MagickPathExtent,sizeof(*interpret_text)); \
       if (interpret_text == (char *) NULL) \
         return((char *) NULL); \
       q=interpret_text+strlen(interpret_text); \
@@ -933,7 +933,7 @@ static char *InterpretDelegateProperties(ImageInfo *image_info,
     { \
       extent+=length; \
       interpret_text=(char *) ResizeQuantumMemory(interpret_text,extent+ \
-        MaxTextExtent,sizeof(*interpret_text)); \
+        MagickPathExtent,sizeof(*interpret_text)); \
       if (interpret_text == (char *) NULL) \
         return((char *) NULL); \
       q=interpret_text+strlen(interpret_text); \
@@ -948,7 +948,7 @@ static char *InterpretDelegateProperties(ImageInfo *image_info,
     { \
       extent+=length; \
       interpret_text=(char *) ResizeQuantumMemory(interpret_text,extent+ \
-        MaxTextExtent,sizeof(*interpret_text)); \
+        MagickPathExtent,sizeof(*interpret_text)); \
       if (interpret_text == (char *) NULL) \
         return((char *) NULL); \
       q=interpret_text+strlen(interpret_text); \

diff --git a/MagickCore/geometry.c b/MagickCore/geometry.c
@@ -462,14 +462,14 @@ MagickExport char *GetPageGeometry(const char *page_geometry)
     };
 
   char
-    page[MaxTextExtent];
+    page[MagickPathExtent];
 
   ssize_t
     i;
 
   assert(page_geometry != (char *) NULL);
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",page_geometry);
-  (void) CopyMagickString(page,page_geometry,MaxTextExtent);
+  (void) CopyMagickString(page,page_geometry,MagickPathExtent);
   for (i=0; i < (ssize_t) (sizeof(PageSizes)/sizeof(PageSizes[0])); i++)
   {
     int
@@ -487,12 +487,12 @@ MagickExport char *GetPageGeometry(const char *page_geometry)
         /*
           Replace mneumonic with the equivalent size in dots-per-inch.
         */
-        (void) FormatLocaleString(page,MaxTextExtent,"%s%.80s",
+        (void) FormatLocaleString(page,MagickPathExtent,"%s%.80s",
           PageSizes[i].geometry,page_geometry+PageSizes[i].extent);
         flags=GetGeometry(page,&geometry.x,&geometry.y,&geometry.width,
           &geometry.height);
         if ((flags & GreaterValue) == 0)
-          (void) ConcatenateMagickString(page,">",MaxTextExtent);
+          (void) ConcatenateMagickString(page,">",MagickPathExtent);
         break;
       }
   }

diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c
@@ -2169,7 +2169,7 @@ static MagickBooleanType HasOpenCLDevices(MagickCLEnv clEnv,
     return(MagickTrue);
 
   /* Get additional options */
-  (void) FormatLocaleString(options,MaxTextExtent,CLOptions,
+  (void) FormatLocaleString(options,MagickPathExtent,CLOptions,
     (float)QuantumRange,(float)QuantumScale,(float)CLCharQuantumScale,
     (float)MagickEpsilon,(float)MagickPI,(unsigned int)MaxMap,
     (unsigned int)MAGICKCORE_QUANTUM_DEPTH);

diff --git a/MagickCore/property.c b/MagickCore/property.c
@@ -2893,7 +2893,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
         {
           WarnNoImageReturn("\"%%[%s]\"",property);
           image->colors=GetNumberColors(image,(FILE *) NULL,exception);
-          (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+          (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
             image->colors);
           break;
         }
@@ -3192,7 +3192,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
                 page;
 
               (void) ParseAbsoluteGeometry(papersize,&page);
-              (void) FormatLocaleString(value,MaxTextExtent,"%.20gx%.20g",
+              (void) FormatLocaleString(value,MagickPathExtent,"%.20gx%.20g",
                 (double) page.width,(double) page.height);
             }
           break;
@@ -3522,7 +3522,7 @@ MagickExport char *InterpretImageProperties(ImageInfo *image_info,Image *image,
     { \
       extent+=length; \
       interpret_text=(char *) ResizeQuantumMemory(interpret_text,extent+ \
-        MaxTextExtent,sizeof(*interpret_text)); \
+        MagickPathExtent,sizeof(*interpret_text)); \
       if (interpret_text == (char *) NULL) \
         { \
           if (property_image != image) \
@@ -3542,7 +3542,7 @@ MagickExport char *InterpretImageProperties(ImageInfo *image_info,Image *image,
     { \
       extent+=length; \
       interpret_text=(char *) ResizeQuantumMemory(interpret_text,extent+ \
-        MaxTextExtent,sizeof(*interpret_text)); \
+        MagickPathExtent,sizeof(*interpret_text)); \
       if (interpret_text == (char *) NULL) \
         { \
           if (property_image != image) \
@@ -3563,7 +3563,7 @@ MagickExport char *InterpretImageProperties(ImageInfo *image_info,Image *image,
     { \
       extent+=length; \
       interpret_text=(char *) ResizeQuantumMemory(interpret_text,extent+ \
-        MaxTextExtent,sizeof(*interpret_text)); \
+        MagickPathExtent,sizeof(*interpret_text)); \
       if (interpret_text == (char *) NULL) \
         { \
           if (property_image != image) \

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
@@ -130,7 +130,7 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info,
   ExceptionInfo *exception)
 {
   char
-    client_name[MaxTextExtent],
+    client_name[MagickPathExtent],
     *option;
 
   double

diff --git a/coders/cin.c b/coders/cin.c
@@ -996,7 +996,7 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image,
   seconds=GetMagickTime();
   GetMagickUTCtime(&seconds,&utc_time);
   (void) memset(timestamp,0,sizeof(timestamp));
-  (void) strftime(timestamp,MaxTextExtent,"%Y:%m:%d:%H:%M:%SUTC",&utc_time);
+  (void) strftime(timestamp,MagickPathExtent,"%Y:%m:%d:%H:%M:%SUTC",&utc_time);
   (void) memset(cin.file.create_date,0,sizeof(cin.file.create_date));
   (void) CopyMagickString(cin.file.create_date,timestamp,11);
   offset+=WriteBlob(image,sizeof(cin.file.create_date),(unsigned char *)
@@ -1093,7 +1093,7 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image,
   offset+=WriteBlob(image,sizeof(cin.origination.filename),(unsigned char *)
     cin.origination.filename);
   (void) memset(timestamp,0,sizeof(timestamp));
-  (void) strftime(timestamp,MaxTextExtent,"%Y:%m:%d:%H:%M:%SUTC",&utc_time);
+  (void) strftime(timestamp,MagickPathExtent,"%Y:%m:%d:%H:%M:%SUTC",&utc_time);
   (void) memset(cin.origination.create_date,0,
     sizeof(cin.origination.create_date));
   (void) CopyMagickString(cin.origination.create_date,timestamp,11);

diff --git a/coders/clipboard.c b/coders/clipboard.c
@@ -200,7 +200,7 @@ static Image *ReadCLIPBOARDImage(const ImageInfo *image_info,
   p[5]=(unsigned char) (total_size >> 24);
   p[10]=offset;
   read_info=CloneImageInfo(image_info);
-  (void) CopyMagickString(read_info->magick,"BMP",MaxTextExtent);
+  (void) CopyMagickString(read_info->magick,"BMP",MagickPathExtent);
   image=BlobToImage(read_info,clip_data,total_size,exception);
   read_info=DestroyImageInfo(read_info);
   clip_data=RelinquishMagickMemory(clip_data);
@@ -330,9 +330,9 @@ static MagickBooleanType WriteCLIPBOARDImage(const ImageInfo *image_info,
     ThrowWriterException(CoderError,"UnableToWriteImageData");
   write_info=CloneImageInfo(image_info);
   if (image->alpha_trait == UndefinedPixelTrait)
-    (void) CopyMagickString(write_info->magick,"BMP3",MaxTextExtent);
+    (void) CopyMagickString(write_info->magick,"BMP3",MagickPathExtent);
   else
-    (void) CopyMagickString(write_info->magick,"BMP",MaxTextExtent);
+    (void) CopyMagickString(write_info->magick,"BMP",MagickPathExtent);
   clip_data=ImageToBlob(write_info,image,&length,exception);
   write_info=DestroyImageInfo(write_info);
   if (clip_data == (void *) NULL)

diff --git a/coders/dot.c b/coders/dot.c
@@ -159,7 +159,7 @@ static Image *ReadDOTImage(const ImageInfo *image_info,ExceptionInfo *exception)
   /*
     Read SVG graph.
   */
-  (void) CopyMagickString(read_info->magick,"SVG",MaxTextExtent);
+  (void) CopyMagickString(read_info->magick,"SVG",MagickPathExtent);
   image=ReadImage(read_info,exception);
   (void) RelinquishUniqueFileResource(read_info->filename);
   read_info=DestroyImageInfo(read_info);

diff --git a/coders/json.c b/coders/json.c
@@ -998,7 +998,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file,
       if (LocaleCompare(image->magick_filename,image->filename) != 0)
         {   
           char
-            filename[MaxTextExtent];
+            filename[MagickPathExtent];
 
           GetPathComponent(image->magick_filename,TailPath,filename);
           JSONFormatLocaleFile(file,"    \"baseName\": %s,\n",filename);

diff --git a/coders/pict.c b/coders/pict.c
@@ -1495,7 +1495,7 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
                 ThrowPICTException(CorruptImageError,"ImproperImageHeader");
               }
             read_info=AcquireImageInfo();
-            (void) FormatLocaleString(read_info->filename,MaxTextExtent,
+            (void) FormatLocaleString(read_info->filename,MagickPathExtent,
               "jpeg:%s",image_info->filename);
             tile_image=BlobToImage(read_info,stream,count,exception);
             pixels=(unsigned char *) RelinquishMagickMemory(pixels);

diff --git a/coders/svg.c b/coders/svg.c
@@ -344,8 +344,9 @@ static Image *RenderSVGImage(const ImageInfo *image_info,Image *image,
           for (next=GetFirstImageInList(svg_image); next != (Image *) NULL; )
           {
             (void) CopyMagickString(next->filename,image->filename,
-              MaxTextExtent);
-            (void) CopyMagickString(next->magick,image->magick,MaxTextExtent);
+              MagickPathExtent);
+            (void) CopyMagickString(next->magick,image->magick,
+              MagickPathExtent);
             next=GetNextImageInList(next);
           }
           return(svg_image);
@@ -634,8 +635,8 @@ static Image *RenderRSVGImage(const ImageInfo *image_info,Image *image,
   (void) CloseBlob(image);
   for (next=GetFirstImageInList(image); next != (Image *) NULL; )
   {
-    (void) CopyMagickString(next->filename,image->filename,MaxTextExtent);
-    (void) CopyMagickString(next->magick,image->magick,MaxTextExtent);
+    (void) CopyMagickString(next->filename,image->filename,MagickPathExtent);
+    (void) CopyMagickString(next->magick,image->magick,MagickPathExtent);
     next=GetNextImageInList(next);
   }
   return(GetFirstImageInList(image));
@@ -3694,8 +3695,8 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception)
     }
   for (next=GetFirstImageInList(image); next != (Image *) NULL; )
   {
-    (void) CopyMagickString(next->filename,image->filename,MaxTextExtent);
-    (void) CopyMagickString(next->magick,"SVG",MaxTextExtent);
+    (void) CopyMagickString(next->filename,image->filename,MagickPathExtent);
+    (void) CopyMagickString(next->magick,"SVG",MagickPathExtent);
     next=GetNextImageInList(next);
   }
   svg_info=DestroySVGInfo(svg_info);

diff --git a/coders/tiff.c b/coders/tiff.c
@@ -588,7 +588,7 @@ static void TIFFErrors(const char *module,const char *format,va_list error)
 #else
   (void) vsprintf(message,format,error);
 #endif
-  message[MaxTextExtent-2]='\0';
+  message[MagickPathExtent-2]='\0';
   (void) ConcatenateMagickString(message,".",MagickPathExtent);
   exception=(ExceptionInfo *) GetMagickThreadValue(tiff_exception);
   if (exception != (ExceptionInfo *) NULL)
@@ -953,7 +953,7 @@ static void TIFFWarnings(const char *module,const char *format,va_list warning)
 #else
   (void) vsprintf(message,format,warning);
 #endif
-  message[MaxTextExtent-2]='\0';
+  message[MagickPathExtent-2]='\0';
   (void) ConcatenateMagickString(message,".",MagickPathExtent);
   exception=(ExceptionInfo *) GetMagickThreadValue(tiff_exception);
   if (exception != (ExceptionInfo *) NULL)

diff --git a/coders/yaml.c b/coders/yaml.c
@@ -996,7 +996,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file,
       if (LocaleCompare(image->magick_filename,image->filename) != 0)
         {   
           char
-            filename[MaxTextExtent];
+            filename[MagickPathExtent];
 
           GetPathComponent(image->magick_filename,TailPath,filename);
           YAMLFormatLocaleFile(file,"    baseName: %s\n",filename);