(no commit message)

diff --git a/coders/fpx.c b/coders/fpx.c
index 7d7c14a63d8793732531d4f5a327fa428cdd7939..f7e863c1c6cb45cc87fce7b236225a9b8bd5ce11 100644 (file)
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -302,7 +302,7 @@ static Image *ReadFPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
           Note image label.
         */
         label=(char *) NULL;
-        if (~summary_info.title.length >= MaxTextExtent)
+        if (~summary_info.title.length >= (MaxTextExtent-1))
           label=(char *) AcquireQuantumMemory(summary_info.title.length+
             MaxTextExtent,sizeof(*label));
         if (label == (char *) NULL)
@@ -326,7 +326,7 @@ static Image *ReadFPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
           Note image comment.
         */
         comments=(char *) NULL;
-        if (~summary_info.comments.length >= MaxTextExtent)
+        if (~summary_info.comments.length >= (MaxTextExtent-1))
           comments=(char *) AcquireQuantumMemory(summary_info.comments.length+
             MaxTextExtent,sizeof(*comments));
         if (comments == (char *) NULL)
@@ -935,7 +935,7 @@ static MagickBooleanType WriteFPXImage(const ImageInfo *image_info,Image *image)
       summary_info.title_valid=MagickTrue;
       length=strlen(label);
       summary_info.title.length=length;
-      if (~length >= MaxTextExtent)
+      if (~length >= (MaxTextExtent-1))
         summary_info.title.ptr=(unsigned char *) AcquireQuantumMemory(
           length+MaxTextExtent,sizeof(*summary_info.title.ptr));
       if (summary_info.title.ptr == (unsigned char *) NULL)

diff --git a/coders/jpeg.c b/coders/jpeg.c
index 99eb41174ca7c4e84a500a3005868540de1799de..1996e6c00f3246c6f0799995d96817ad9bad68fb 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -369,7 +369,7 @@ static boolean ReadComment(j_decompress_ptr jpeg_info)
   if (length <= 0)
     return(MagickTrue);
   comment=(char *) NULL;
-  if (~length >= MaxTextExtent)
+  if (~length >= (MaxTextExtent-1))
     comment=(char *) AcquireQuantumMemory(length+MaxTextExtent,
       sizeof(*comment));
   if (comment == (char *) NULL)

diff --git a/coders/msl.c b/coders/msl.c
index 74bab38c290be8f54ae220fd7fdd5d622371a075..d4dca0d937fd6042a5f6b88be9813da416a53cc7 100644 (file)
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -7345,7 +7345,7 @@ static void MSLCharacters(void *context,const xmlChar *c,int length)
   else
     {
       msl_info->content=(char *) NULL;
-      if (~length >= MaxTextExtent)
+      if (~length >= (MaxTextExtent-1))
         msl_info->content=(char *) AcquireQuantumMemory(length+MaxTextExtent,
           sizeof(*msl_info->content));
       if (msl_info->content != (char *) NULL)

diff --git a/coders/tga.c b/coders/tga.c
index 87f954b42678bb7889b1007055a10c91ee4adbd2..f963b88a49a47bbf086fb13288d954513bc462f5 100644 (file)
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -271,7 +271,7 @@ static Image *ReadTGAImage(const ImageInfo *image_info,ExceptionInfo *exception)
       */
       length=(size_t) tga_info.id_length;
       comment=(char *) NULL;
-      if (~length >= MaxTextExtent)
+      if (~length >= (MaxTextExtent-1))
         comment=(char *) AcquireQuantumMemory(length+MaxTextExtent,
           sizeof(*comment));
       if (comment == (char *) NULL)

diff --git a/magick/blob.c b/magick/blob.c
index 0e30d90b3d1f1a5fea58e5c7c2599dca0cb01b94..98cd9fe7744aa30b22c5671e3b2fc66f1ef57b57 100644 (file)
--- a/magick/blob.c
+++ b/magick/blob.c
@@ -983,7 +983,7 @@ MagickExport unsigned char *FileToBlob(const char *filename,const size_t extent,
     }
   *length=(size_t) MagickMin((MagickSizeType) offset,extent);
   blob=(unsigned char *) NULL;
-  if (~(*length) >= MaxTextExtent)
+  if (~(*length) >= (MaxTextExtent-1))
     blob=(unsigned char *) AcquireQuantumMemory(*length+MaxTextExtent,
       sizeof(*blob));
   if (blob == (unsigned char *) NULL)

diff --git a/magick/geometry.c b/magick/geometry.c
index 53db9e5698b0d0dc1403f63021b3ee16a9a4ea47..a705b3554408169fbaa4449203ae4cd9084665db 100644 (file)
--- a/magick/geometry.c
+++ b/magick/geometry.c
@@ -102,7 +102,7 @@ MagickExport MagickStatusType GetGeometry(const char *geometry,ssize_t *x,
   flags=NoValue;
   if ((geometry == (char *) NULL) || (*geometry == '\0'))
     return(flags);
-  if (strlen(geometry) >= MaxTextExtent)
+  if (strlen(geometry) >= (MaxTextExtent-1))
     return(flags);
   (void) CopyMagickString(pedantic_geometry,geometry,MaxTextExtent);
   for (p=pedantic_geometry; *p != '\0'; )
@@ -757,7 +757,7 @@ MagickExport MagickStatusType ParseGeometry(const char *geometry,
   flags=NoValue;
   if ((geometry == (char *) NULL) || (*geometry == '\0'))
     return(flags);
-  if (strlen(geometry) >= MaxTextExtent)
+  if (strlen(geometry) >= (MaxTextExtent-1))
     return(flags);
   (void) CopyMagickString(pedantic_geometry,geometry,MaxTextExtent);
   for (p=pedantic_geometry; *p != '\0'; )

diff --git a/magick/identify.c b/magick/identify.c
index 4ecebf1778c91805b0d73874c7f0db68c2ad42ab..85d7f3d6058f01b28a03f9a31cfc5019154e7f0e 100644 (file)
--- a/magick/identify.c
+++ b/magick/identify.c
@@ -1005,7 +1005,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
               length=(size_t) (GetStringInfoDatum(profile)[i++] << 8);
               length|=GetStringInfoDatum(profile)[i++];
               attribute=(char *) NULL;
-              if (~length >= MaxTextExtent)
+              if (~length >= (MaxTextExtent-1))
                 attribute=(char *) AcquireQuantumMemory(length+
                   MaxTextExtent,sizeof(*attribute));
               if (attribute != (char *) NULL)

diff --git a/magick/nt-base.c b/magick/nt-base.c
index 14dc3b586376552f3a38740142dcd19913b1990e..b9b89a695071b24d4a58369a2711d19ab69c6b49 100644 (file)
--- a/magick/nt-base.c
+++ b/magick/nt-base.c
@@ -1374,11 +1374,11 @@ MagickExport DIR *NTOpenDirectory(const char *path)
 
   assert(path != (const char *) NULL);
   length=CopyMagickString(file_specification,path,MaxTextExtent);
-  if (length >= MaxTextExtent)
+  if (length >= (MaxTextExtent-1))
     return((DIR *) NULL);
   length=ConcatenateMagickString(file_specification,DirectorySeparator,
     MaxTextExtent);
-  if (length >= MaxTextExtent)
+  if (length >= (MaxTextExtent-1))
     return((DIR *) NULL);
   entry=(DIR *) AcquireMagickMemory(sizeof(DIR));
   if (entry != (DIR *) NULL)
@@ -1389,7 +1389,7 @@ MagickExport DIR *NTOpenDirectory(const char *path)
   if (entry->hSearch == INVALID_HANDLE_VALUE)
     {
       length=ConcatenateMagickString(file_specification,"\\*.*",MaxTextExtent);
-      if (length >= MaxTextExtent)
+      if (length >= (MaxTextExtent-1))
         {
           entry=(DIR *) RelinquishMagickMemory(entry);
           return((DIR *) NULL);

diff --git a/magick/property.c b/magick/property.c
index 86a26681988b00dc17b76c30ef4f696fc304016d..60acd764164dbf46efddbbdc5f89287a0484f467 100644 (file)
--- a/magick/property.c
+++ b/magick/property.c
@@ -588,7 +588,7 @@ static MagickBooleanType Get8BIMProperty(const Image *image,const char *key)
     if ((count != 0) && ((size_t) count <= length))
       {
         resource=(char *) NULL;
-        if (~(1UL*count) >= MaxTextExtent)
+        if (~(1UL*count) >= (MaxTextExtent-1))
           resource=(char *) AcquireQuantumMemory((size_t) count+MaxTextExtent,
             sizeof(*resource));
         if (resource != (char *) NULL)
@@ -625,7 +625,7 @@ static MagickBooleanType Get8BIMProperty(const Image *image,const char *key)
       We have the resource of interest.
     */
     attribute=(char *) NULL;
-    if (~(1UL*count) >= MaxTextExtent)
+    if (~(1UL*count) >= (MaxTextExtent-1))
       attribute=(char *) AcquireQuantumMemory((size_t) count+MaxTextExtent,
         sizeof(*attribute));
     if (attribute != (char *) NULL)
@@ -732,7 +732,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
    { \
      length+=FormatLocaleString(buffer+length,MaxTextExtent-length, \
        format", ",arg); \
-     if (length >= MaxTextExtent - 1) \
+     if (length >= (MaxTextExtent-1)) \
        length=MaxTextExtent-1; \
      p1+=size; \
    } \
@@ -758,7 +758,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
    { \
      length+=FormatLocaleString(buffer+length,MaxTextExtent-length, \
        format", ",arg1, arg2); \
-     if (length >= MaxTextExtent - 1) \
+     if (length >= (MaxTextExtent-1)) \
        length=MaxTextExtent-1; \
      p1+=size; \
    } \

diff --git a/magick/string.c b/magick/string.c
index 6ae43debe70b492221adfb533c7c2cf28d99b8d7..59f6c3e535608223c0aad62c895ff5fdad24db13 100644 (file)
--- a/magick/string.c
+++ b/magick/string.c
@@ -168,7 +168,7 @@ MagickExport StringInfo *AcquireStringInfo(const size_t length)
   if (string_info->length != 0)
     {
       string_info->datum=(unsigned char *) NULL;
-      if (~string_info->length >= MaxTextExtent)
+      if (~string_info->length >= (MaxTextExtent-1))
         string_info->datum=(unsigned char *) AcquireQuantumMemory(
           string_info->length+MaxTextExtent,sizeof(*string_info->datum));
       if (string_info->datum == (unsigned char *) NULL)
@@ -551,7 +551,7 @@ MagickExport StringInfo *ConfigureFileToStringInfo(const char *filename)
     }
   length=(size_t) offset;
   string=(char *) NULL;
-  if (~length > MaxTextExtent)
+  if (~length >= (MaxTextExtent-1))
     string=(char *) AcquireQuantumMemory(length+MaxTextExtent,sizeof(*string));
   if (string == (char *) NULL)
     {
@@ -873,7 +873,7 @@ MagickExport char *EscapeString(const char *source,const char escape)
         length++;
       }
   destination=(char *) NULL;
-  if (~length >= MaxTextExtent)
+  if (~length >= (MaxTextExtent-1))
     destination=(char *) AcquireQuantumMemory(length+MaxTextExtent,
       sizeof(*destination));
   if (destination == (char *) NULL)
@@ -1795,7 +1795,7 @@ MagickExport char *StringInfoToString(const StringInfo *string_info)
 
   string=(char *) NULL;
   length=string_info->length;
-  if (~length >= MaxTextExtent)
+  if (~length >= (MaxTextExtent-1))
     string=(char *) AcquireQuantumMemory(length+MaxTextExtent,sizeof(*string));
   if (string == (char *) NULL)
     return((char *) NULL);

diff --git a/magick/threshold.c b/magick/threshold.c
index dd4a1457b0f334ca40f0ff12a432ee4422b14a3f..532ed1d6bcf175de260c3aef8d79c1f8cf912620 100644 (file)
--- a/magick/threshold.c
+++ b/magick/threshold.c
@@ -1413,7 +1413,7 @@ MagickExport MagickBooleanType OrderedPosterizeImageChannel(Image *image,
     threshold_map=p;
     while (((isspace((int) ((unsigned char) *p)) == 0) && (*p != ',')) &&
                     (*p != '\0')) {
-      if ((p-threshold_map) >= MaxTextExtent)
+      if ((p-threshold_map) >= (MaxTextExtent-1))
         break;
       token[p-threshold_map] = *p;
       p++;

diff --git a/magick/utility.c b/magick/utility.c
index c1007465b7728ccdb8d605aae6e1748b945137c3..6d3cbb1fc2f94291f26f32e5f6bd71817861ccbc 100644 (file)
--- a/magick/utility.c
+++ b/magick/utility.c
@@ -877,7 +877,7 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments,
               (void) ConcatenateMagickString(path,subimage,MaxTextExtent);
               (void) ConcatenateMagickString(path,"]",MaxTextExtent);
             }
-          if (strlen(path) >= MaxTextExtent)
+          if (strlen(path) >= (MaxTextExtent-1))
             ThrowFatalException(OptionFatalError,"FilenameTruncated");
           if (destroy != MagickFalse)
             {

diff --git a/magick/widget.c b/magick/widget.c
index 8b647aca9eb850bf347d34410068f91b635cb9a1..07742fe292e69cc300dc25c79425aff9ef278172 100644 (file)
--- a/magick/widget.c
+++ b/magick/widget.c
@@ -2699,7 +2699,7 @@ MagickExport void XColorBrowserWidget(Display *display,XWindows *windows,
         if ((status != Success) || (type != XA_STRING) || (format == 32) ||
             (length == 0))
           break;
-        if ((Extent(reply_info.text)+length) >= MaxTextExtent)
+        if ((Extent(reply_info.text)+length) >= (MaxTextExtent-1))
           (void) XBell(display,0);
         else
           {
@@ -4124,7 +4124,7 @@ MagickExport int XDialogWidget(Display *display,XWindows *windows,
         if ((status != Success) || (type != XA_STRING) || (format == 32) ||
             (length == 0))
           break;
-        if ((Extent(reply_info.text)+length) >= MaxTextExtent)
+        if ((Extent(reply_info.text)+length) >= (MaxTextExtent-1))
           (void) XBell(display,0);
         else
           {
@@ -5344,7 +5344,7 @@ MagickExport void XFileBrowserWidget(Display *display,XWindows *windows,
         if ((status != Success) || (type != XA_STRING) || (format == 32) ||
             (length == 0))
           break;
-        if ((Extent(reply_info.text)+length) >= MaxTextExtent)
+        if ((Extent(reply_info.text)+length) >= (MaxTextExtent-1))
           (void) XBell(display,0);
         else
           {
@@ -6562,7 +6562,7 @@ MagickExport void XFontBrowserWidget(Display *display,XWindows *windows,
         if ((status != Success) || (type != XA_STRING) || (format == 32) ||
             (length == 0))
           break;
-        if ((Extent(reply_info.text)+length) >= MaxTextExtent)
+        if ((Extent(reply_info.text)+length) >= (MaxTextExtent-1))
           (void) XBell(display,0);
         else
           {
@@ -7569,7 +7569,7 @@ MagickExport void XListBrowserWidget(Display *display,XWindows *windows,
         if ((status != Success) || (type != XA_STRING) || (format == 32) ||
             (length == 0))
           break;
-        if ((Extent(reply_info.text)+length) >= MaxTextExtent)
+        if ((Extent(reply_info.text)+length) >= (MaxTextExtent-1))
           (void) XBell(display,0);
         else
           {

diff --git a/wand/mogrify.c b/wand/mogrify.c
index 80bf1bfcf242daed1bcee309b1fa1054e9c576cb..815bac67bcf3506d496896da17977a179e2bda2d 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -8050,7 +8050,7 @@ This has been merged completely into MogrifyImage()
                 */
                 length=strlen(argv[i+1]);
                 token=(char *) NULL;
-                if (~length >= MaxTextExtent)
+                if (~length >= (MaxTextExtent-1))
                   token=(char *) AcquireQuantumMemory(length+MaxTextExtent,
                     sizeof(*token));
                 if (token == (char *) NULL)