From 4cc316818e5b841ff5a9394a0730d5be6e8686ce Mon Sep 17 00:00:00 2001
From: dirk <dirk@git.imagemagick.org>
Date: Sat, 26 Mar 2016 10:50:49 +0100
Subject: [PATCH] Use correct extent value when calling GetNextToken.

---
 coders/svg.c        | 192 ++++++++++++++++++-------------------
 magick/coder.c      |  22 +++--
 magick/color.c      |  22 +++--
 magick/configure.c  |  22 +++--
 magick/delegate.c   |  35 -------
 magick/deprecate.c  |  35 +++++++
 magick/draw.c       | 228 ++++++++++++++++++++++----------------------
 magick/locale.c     |  26 ++---
 magick/log.c        |  24 +++--
 magick/magic.c      |  22 +++--
 magick/methods.h    |   2 +-
 magick/nt-feature.c |   2 +-
 magick/policy.c     |  22 +++--
 magick/token.c      |   2 +-
 magick/type.c       |  22 +++--
 15 files changed, 356 insertions(+), 322 deletions(-)

diff --git a/coders/svg.c b/coders/svg.c
index 9a2492b628..34590fd9cb 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -3656,14 +3656,13 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
     i;
 
   size_t
-    length;
+    extent,
+    length,
+    number_points;
 
   SVGInfo
     svg_info;
 
-  size_t
-    number_points;
-
   /*
     Open output image file.
   */
@@ -3708,6 +3707,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
     ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
   GetAffineMatrix(&affine);
   token=AcquireString(value);
+  extent=strlen(token)+MaxTextExtent;
   active=MagickFalse;
   n=0;
   status=MagickTrue;
@@ -3716,7 +3716,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
     /*
       Interpret graphic primitive.
     */
-    GetNextToken(q,&q,MaxTextExtent,keyword);
+    GetNextToken(q,&q,extent,keyword);
     if (*keyword == '\0')
       break;
     if (*keyword == '#')
@@ -3752,33 +3752,33 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
       {
         if (LocaleCompare("affine",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             affine.sx=StringToDouble(token,(char **) NULL);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             affine.rx=StringToDouble(token,(char **) NULL);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             affine.ry=StringToDouble(token,(char **) NULL);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             affine.sy=StringToDouble(token,(char **) NULL);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             affine.tx=StringToDouble(token,(char **) NULL);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             affine.ty=StringToDouble(token,(char **) NULL);
             break;
           }
         if (LocaleCompare("angle",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             affine.rx=StringToDouble(token,(char **) NULL);
             affine.ry=StringToDouble(token,(char **) NULL);
             break;
@@ -3807,7 +3807,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
       {
         if (LocaleCompare("clip-path",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "clip-path:url(#%s);",token);
             (void) WriteBlobString(image,message);
@@ -3815,7 +3815,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("clip-rule",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "clip-rule:%s;",token);
             (void) WriteBlobString(image,message);
@@ -3823,7 +3823,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("clip-units",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "clipPathUnits=%s;",token);
             (void) WriteBlobString(image,message);
@@ -3847,7 +3847,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
       {
         if (LocaleCompare("decorate",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "text-decoration:%s;",token);
             (void) WriteBlobString(image,message);
@@ -3872,7 +3872,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
       {
         if (LocaleCompare("fill",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,"fill:%s;",
               token);
             (void) WriteBlobString(image,message);
@@ -3880,7 +3880,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("fill-rule",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "fill-rule:%s;",token);
             (void) WriteBlobString(image,message);
@@ -3888,7 +3888,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("fill-opacity",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "fill-opacity:%s;",token);
             (void) WriteBlobString(image,message);
@@ -3896,7 +3896,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("font-family",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "font-family:%s;",token);
             (void) WriteBlobString(image,message);
@@ -3904,7 +3904,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("font-stretch",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "font-stretch:%s;",token);
             (void) WriteBlobString(image,message);
@@ -3912,7 +3912,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("font-style",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "font-style:%s;",token);
             (void) WriteBlobString(image,message);
@@ -3920,7 +3920,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("font-size",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "font-size:%s;",token);
             (void) WriteBlobString(image,message);
@@ -3928,7 +3928,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("font-weight",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "font-weight:%s;",token);
             (void) WriteBlobString(image,message);
@@ -3942,12 +3942,12 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
       {
         if (LocaleCompare("gradient-units",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             break;
           }
         if (LocaleCompare("text-align",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "text-align %s ",token);
             (void) WriteBlobString(image,message);
@@ -3955,7 +3955,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("text-anchor",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "text-anchor %s ",token);
             (void) WriteBlobString(image,message);
@@ -3969,7 +3969,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
       {
         if (LocaleCompare("image",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             primitive_type=ImagePrimitive;
             break;
           }
@@ -4003,7 +4003,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
       {
         if (LocaleCompare("opacity",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,"opacity %s ",
               token);
             (void) WriteBlobString(image,message);
@@ -4037,7 +4037,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("pop",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (LocaleCompare("clip-path",token) == 0)
               {
                 (void) WriteBlobString(image,"</clipPath>\n");
@@ -4074,10 +4074,10 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("push",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (LocaleCompare("clip-path",token) == 0)
               {
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 (void) FormatLocaleString(message,MaxTextExtent,
                   "<clipPath id=\"%s\">\n",token);
                 (void) WriteBlobString(image,message);
@@ -4090,27 +4090,27 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
               }
             if (LocaleCompare("gradient",token) == 0)
               {
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 (void) CopyMagickString(name,token,MaxTextExtent);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 (void) CopyMagickString(type,token,MaxTextExtent);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 svg_info.segment.x1=StringToDouble(token,(char **) NULL);
                 svg_info.element.cx=StringToDouble(token,(char **) NULL);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 if (*token == ',')
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                 svg_info.segment.y1=StringToDouble(token,(char **) NULL);
                 svg_info.element.cy=StringToDouble(token,(char **) NULL);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 if (*token == ',')
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                 svg_info.segment.x2=StringToDouble(token,(char **) NULL);
                 svg_info.element.major=StringToDouble(token,
                   (char **) NULL);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 if (*token == ',')
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                 svg_info.segment.y2=StringToDouble(token,(char **) NULL);
                 svg_info.element.minor=StringToDouble(token,
                   (char **) NULL);
@@ -4120,9 +4120,9 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
                   svg_info.segment.y1,svg_info.segment.x2,svg_info.segment.y2);
                 if (LocaleCompare(type,"radial") == 0)
                   {
-                    GetNextToken(q,&q,MaxTextExtent,token);
+                    GetNextToken(q,&q,extent,token);
                     if (*token == ',')
-                      GetNextToken(q,&q,MaxTextExtent,token);
+                      GetNextToken(q,&q,extent,token);
                     svg_info.element.angle=StringToDouble(token,
                       (char **) NULL);
                     (void) FormatLocaleString(message,MaxTextExtent,
@@ -4148,22 +4148,22 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
               }
             if (LocaleCompare("pattern",token) == 0)
               {
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 (void) CopyMagickString(name,token,MaxTextExtent);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 svg_info.bounds.x=StringToDouble(token,(char **) NULL);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 if (*token == ',')
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                 svg_info.bounds.y=StringToDouble(token,(char **) NULL);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 if (*token == ',')
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                 svg_info.bounds.width=StringToDouble(token,
                   (char **) NULL);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 if (*token == ',')
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                 svg_info.bounds.height=StringToDouble(token,
                   (char **) NULL);
                 (void) FormatLocaleString(message,MaxTextExtent,
@@ -4194,7 +4194,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("rotate",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,"rotate(%s) ",
               token);
             (void) WriteBlobString(image,message);
@@ -4208,17 +4208,17 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
       {
         if (LocaleCompare("scale",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             affine.sx=StringToDouble(token,(char **) NULL);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             affine.sy=StringToDouble(token,(char **) NULL);
             break;
           }
         if (LocaleCompare("skewX",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,"skewX(%s) ",
               token);
             (void) WriteBlobString(image,message);
@@ -4226,7 +4226,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("skewY",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,"skewY(%s) ",
               token);
             (void) WriteBlobString(image,message);
@@ -4237,9 +4237,9 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
             char
               color[MaxTextExtent];
 
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) CopyMagickString(color,token,MaxTextExtent);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "  <stop offset=\"%s\" stop-color=\"%s\" />\n",token,color);
             (void) WriteBlobString(image,message);
@@ -4247,7 +4247,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("stroke",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,"stroke:%s;",
               token);
             (void) WriteBlobString(image,message);
@@ -4255,7 +4255,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("stroke-antialias",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "stroke-antialias:%s;",token);
             (void) WriteBlobString(image,message);
@@ -4269,13 +4269,13 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
                   k;
 
                 p=q;
-                GetNextToken(p,&p,MaxTextExtent,token);
+                GetNextToken(p,&p,extent,token);
                 for (k=0; IsPoint(token); k++)
-                  GetNextToken(p,&p,MaxTextExtent,token);
+                  GetNextToken(p,&p,extent,token);
                 (void) WriteBlobString(image,"stroke-dasharray:");
                 for (j=0; j < k; j++)
                 {
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                   (void) FormatLocaleString(message,MaxTextExtent,"%s ",
                     token);
                   (void) WriteBlobString(image,message);
@@ -4283,7 +4283,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
                 (void) WriteBlobString(image,";");
                 break;
               }
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "stroke-dasharray:%s;",token);
             (void) WriteBlobString(image,message);
@@ -4291,7 +4291,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("stroke-dashoffset",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "stroke-dashoffset:%s;",token);
             (void) WriteBlobString(image,message);
@@ -4299,7 +4299,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("stroke-linecap",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "stroke-linecap:%s;",token);
             (void) WriteBlobString(image,message);
@@ -4307,7 +4307,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("stroke-linejoin",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "stroke-linejoin:%s;",token);
             (void) WriteBlobString(image,message);
@@ -4315,7 +4315,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("stroke-miterlimit",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "stroke-miterlimit:%s;",token);
             (void) WriteBlobString(image,message);
@@ -4323,7 +4323,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("stroke-opacity",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "stroke-opacity:%s;",token);
             (void) WriteBlobString(image,message);
@@ -4331,7 +4331,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("stroke-width",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "stroke-width:%s;",token);
             (void) WriteBlobString(image,message);
@@ -4350,7 +4350,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("text-antialias",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MaxTextExtent,
               "text-antialias:%s;",token);
             (void) WriteBlobString(image,message);
@@ -4363,11 +4363,11 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
           }
         if (LocaleCompare("translate",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             affine.tx=StringToDouble(token,(char **) NULL);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             affine.ty=StringToDouble(token,(char **) NULL);
             break;
           }
@@ -4379,16 +4379,16 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
       {
         if (LocaleCompare("viewbox",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
-            GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
-            GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
-            GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
+            GetNextToken(q,&q,extent,token);
             break;
           }
         status=MagickFalse;
@@ -4416,15 +4416,15 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
       */
       if (IsPoint(q) == MagickFalse)
         break;
-      GetNextToken(q,&q,MaxTextExtent,token);
+      GetNextToken(q,&q,extent,token);
       point.x=StringToDouble(token,(char **) NULL);
-      GetNextToken(q,&q,MaxTextExtent,token);
+      GetNextToken(q,&q,extent,token);
       if (*token == ',')
-        GetNextToken(q,&q,MaxTextExtent,token);
+        GetNextToken(q,&q,extent,token);
       point.y=StringToDouble(token,(char **) NULL);
-      GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
+      GetNextToken(q,(const char **) NULL,extent,token);
       if (*token == ',')
-        GetNextToken(q,&q,MaxTextExtent,token);
+        GetNextToken(q,&q,extent,token);
       primitive_info[i].primitive=primitive_type;
       primitive_info[i].point=point;
       primitive_info[i].coordinates=0;
@@ -4621,7 +4621,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
         int
           number_attributes;
 
-        GetNextToken(q,&q,MaxTextExtent,token);
+        GetNextToken(q,&q,extent,token);
         number_attributes=1;
         for (p=token; *p != '\0'; p++)
           if (isalpha((int) *p))
@@ -4652,7 +4652,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
             status=MagickFalse;
             break;
           }
-        GetNextToken(q,&q,MaxTextExtent,token);
+        GetNextToken(q,&q,extent,token);
         if (LocaleCompare("point",token) == 0)
           primitive_info[j].method=PointMethod;
         if (LocaleCompare("replace",token) == 0)
@@ -4675,7 +4675,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
             status=MagickFalse;
             break;
           }
-        GetNextToken(q,&q,MaxTextExtent,token);
+        GetNextToken(q,&q,extent,token);
         (void) FormatLocaleString(message,MaxTextExtent,
           "  <text x=\"%g\" y=\"%g\">",primitive_info[j].point.x,
           primitive_info[j].point.y);
@@ -4698,7 +4698,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image)
             status=MagickFalse;
             break;
           }
-        GetNextToken(q,&q,MaxTextExtent,token);
+        GetNextToken(q,&q,extent,token);
         (void) FormatLocaleString(message,MaxTextExtent,
           "  <image x=\"%g\" y=\"%g\" width=\"%g\" height=\"%g\" "
           "xlink:href=\"%s\"/>\n",primitive_info[j].point.x,
diff --git a/magick/coder.c b/magick/coder.c
index f34adc73db..09dab114ea 100644
--- a/magick/coder.c
+++ b/magick/coder.c
@@ -774,7 +774,7 @@ MagickExport MagickBooleanType ListCoderInfo(FILE *file,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   L o a d C o d e r L i s t                                                 %
++   L o a d C o d e r C a c h e                                               %
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -817,6 +817,9 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache,
   MagickStatusType
     status;
 
+  size_t
+    extent;
+
   /*
     Load the coder map file.
   */
@@ -827,12 +830,13 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache,
   status=MagickTrue;
   coder_info=(CoderInfo *) NULL;
   token=AcquireString(xml);
+  extent=strlen(token)+MaxTextExtent;
   for (q=(char *) xml; *q != '\0'; )
   {
     /*
       Interpret XML.
     */
-    GetNextToken(q,&q,MaxTextExtent,token);
+    GetNextToken(q,&q,extent,token);
     if (*token == '\0')
       break;
     (void) CopyMagickString(keyword,token,MaxTextExtent);
@@ -842,7 +846,7 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache,
           Doctype element.
         */
         while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         continue;
       }
     if (LocaleNCompare(keyword,"<!--",4) == 0)
@@ -851,7 +855,7 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache,
           Comment element.
         */
         while ((LocaleNCompare(q,"->",2) != 0) && (*q != '\0'))
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         continue;
       }
     if (LocaleCompare(keyword,"<include") == 0)
@@ -862,10 +866,10 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache,
         while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
         {
           (void) CopyMagickString(keyword,token,MaxTextExtent);
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (*token != '=')
             continue;
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (LocaleCompare(keyword,"file") == 0)
             {
               if (depth > 200)
@@ -924,11 +928,11 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache,
         coder_info=(CoderInfo *) NULL;
         continue;
       }
-    GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
+    GetNextToken(q,(const char **) NULL,extent,token);
     if (*token != '=')
       continue;
-    GetNextToken(q,&q,MaxTextExtent,token);
-    GetNextToken(q,&q,MaxTextExtent,token);
+    GetNextToken(q,&q,extent,token);
+    GetNextToken(q,&q,extent,token);
     switch (*keyword)
     {
       case 'M':
diff --git a/magick/color.c b/magick/color.c
index 9ddd9df04f..b1cb1da8e4 100644
--- a/magick/color.c
+++ b/magick/color.c
@@ -2180,7 +2180,7 @@ MagickExport MagickBooleanType ListColorInfo(FILE *file,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   L o a d C o l o r L i s t                                                 %
++   L o a d C o l o r C a c h e                                               %
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -2223,6 +2223,9 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
   MagickStatusType
     status;
 
+  size_t
+    extent;
+
   /*
     Load the color map file.
   */
@@ -2233,12 +2236,13 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
   status=MagickTrue;
   color_info=(ColorInfo *) NULL;
   token=AcquireString(xml);
+  extent=strlen(token)+MaxTextExtent;
   for (q=(char *) xml; *q != '\0'; )
   {
     /*
       Interpret XML.
     */
-    GetNextToken(q,&q,MaxTextExtent,token);
+    GetNextToken(q,&q,extent,token);
     if (*token == '\0')
       break;
     (void) CopyMagickString(keyword,token,MaxTextExtent);
@@ -2248,7 +2252,7 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
           Doctype element.
         */
         while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         continue;
       }
     if (LocaleNCompare(keyword,"<!--",4) == 0)
@@ -2257,7 +2261,7 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
           Comment element.
         */
         while ((LocaleNCompare(q,"->",2) != 0) && (*q != '\0'))
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         continue;
       }
     if (LocaleCompare(keyword,"<include") == 0)
@@ -2268,10 +2272,10 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
         while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
         {
           (void) CopyMagickString(keyword,token,MaxTextExtent);
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (*token != '=')
             continue;
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (LocaleCompare(keyword,"file") == 0)
             {
               if (depth > 200)
@@ -2329,11 +2333,11 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
         color_info=(ColorInfo *) NULL;
         continue;
       }
-    GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
+    GetNextToken(q,(const char **) NULL,extent,token);
     if (*token != '=')
       continue;
-    GetNextToken(q,&q,MaxTextExtent,token);
-    GetNextToken(q,&q,MaxTextExtent,token);
+    GetNextToken(q,&q,extent,token);
+    GetNextToken(q,&q,extent,token);
     switch (*keyword)
     {
       case 'C':
diff --git a/magick/configure.c b/magick/configure.c
index 80383e5869..7b6db03300 100644
--- a/magick/configure.c
+++ b/magick/configure.c
@@ -1157,6 +1157,9 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache,
   MagickStatusType
     status;
 
+  size_t
+    extent;
+
   /*
     Load the configure map file.
   */
@@ -1164,13 +1167,14 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache,
     "Loading configure file \"%s\" ...",filename);
   status=MagickTrue;
   configure_info=(ConfigureInfo *) NULL;
-  token=AcquireString((char *) xml);
+  token=AcquireString(xml);
+  extent=strlen(token)+MaxTextExtent;
   for (q=(char *) xml; *q != '\0'; )
   {
     /*
       Interpret XML.
     */
-    GetNextToken(q,&q,MaxTextExtent,token);
+    GetNextToken(q,&q,extent,token);
     if (*token == '\0')
       break;
     (void) CopyMagickString(keyword,token,MaxTextExtent);
@@ -1180,7 +1184,7 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache,
           Doctype element.
         */
         while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         continue;
       }
     if (LocaleNCompare(keyword,"<!--",4) == 0)
@@ -1189,7 +1193,7 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache,
           Comment element.
         */
         while ((LocaleNCompare(q,"->",2) != 0) && (*q != '\0'))
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         continue;
       }
     if (LocaleCompare(keyword,"<include") == 0)
@@ -1200,10 +1204,10 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache,
         while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
         {
           (void) CopyMagickString(keyword,token,MaxTextExtent);
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (*token != '=')
             continue;
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (LocaleCompare(keyword,"file") == 0)
             {
               if (depth > 200)
@@ -1265,11 +1269,11 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache,
     /*
       Parse configure element.
     */
-    GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
+    GetNextToken(q,(const char **) NULL,extent,token);
     if (*token != '=')
       continue;
-    GetNextToken(q,&q,MaxTextExtent,token);
-    GetNextToken(q,&q,MaxTextExtent,token);
+    GetNextToken(q,&q,extent,token);
+    GetNextToken(q,&q,extent,token);
     switch (*keyword)
     {
       case 'N':
diff --git a/magick/delegate.c b/magick/delegate.c
index 368b8c09f5..55b4dc1936 100644
--- a/magick/delegate.c
+++ b/magick/delegate.c
@@ -959,41 +959,6 @@ MagickExport MagickBooleanType GetDelegateThreadSupport(
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   G e t M a g i c k T o k e n                                               %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  MagickToken() gets a token from the token stream.  A token is defined as
-%  a sequence of characters delimited by whitespace (e.g. clip-path), a
-%  sequence delimited with quotes (.e.g "Quote me"), or a sequence enclosed in
-%  parenthesis (e.g. rgb(0,0,0)).  GetNextToken() also recognizes these
-%  separator characters: ':', '=', ',', and ';'.
-%
-%  The format of the MagickToken method is:
-%
-%      void MagickToken(const char *start,const char **end,char *token)
-%
-%  A description of each parameter follows:
-%
-%    o start: the start of the token sequence.
-%
-%    o end: point to the end of the token sequence.
-%
-%    o token: copy the token to this buffer.
-%
-*/
-MagickExport void GetMagickToken(const char *start,const char **end,char *token)
-{
-  GetNextToken(start,end,~0UL,token);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
 +   I s D e l e g a t e C a c h e I n s t a n t i a t e d                     %
 %                                                                             %
 %                                                                             %
diff --git a/magick/deprecate.c b/magick/deprecate.c
index 3cc78bef3d..9c2673451b 100644
--- a/magick/deprecate.c
+++ b/magick/deprecate.c
@@ -2884,6 +2884,41 @@ MagickExport void *GetMagickRegistry(const ssize_t id,RegistryType *type,
 %                                                                             %
 %                                                                             %
 %                                                                             %
++   G e t M a g i c k T o k e n                                               %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  MagickToken() gets a token from the token stream.  A token is defined as
+%  a sequence of characters delimited by whitespace (e.g. clip-path), a
+%  sequence delimited with quotes (.e.g "Quote me"), or a sequence enclosed in
+%  parenthesis (e.g. rgb(0,0,0)).  GetNextToken() also recognizes these
+%  separator characters: ':', '=', ',', and ';'.
+%
+%  The format of the MagickToken method is:
+%
+%      void MagickToken(const char *start,const char **end,char *token)
+%
+%  A description of each parameter follows:
+%
+%    o start: the start of the token sequence.
+%
+%    o end: point to the end of the token sequence.
+%
+%    o token: copy the token to this buffer.
+%
+*/
+MagickExport void GetMagickToken(const char *start,const char **end,char *token)
+{
+  GetNextToken(start,end,~0UL,token);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 %   G e t I m a g e G e o m e t r y                                           %
 %                                                                             %
 %                                                                             %
diff --git a/magick/draw.c b/magick/draw.c
index 114357bbd0..5180606281 100644
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -1722,6 +1722,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
     bounds;
 
   size_t
+    extent,
     length,
     number_points;
 
@@ -1786,6 +1787,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
       graphic_context[n]->viewbox.height=image->rows;
     }
   token=AcquireString(primitive);
+  extent=strlen(token)+MaxTextExtent;
   (void) QueryColorDatabase("#000000",&start_color,&image->exception);
   if (SetImageStorageClass(image,DirectClass) == MagickFalse)
     return(MagickFalse);
@@ -1795,7 +1797,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
     /*
       Interpret graphic primitive.
     */
-    GetNextToken(q,&q,MaxTextExtent,keyword);
+    GetNextToken(q,&q,extent,keyword);
     if (*keyword == '\0')
       break;
     if (*keyword == '#')
@@ -1820,27 +1822,27 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
       {
         if (LocaleCompare("affine",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             affine.sx=StringToDouble(token,(char **) NULL);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             affine.rx=StringToDouble(token,(char **) NULL);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             affine.ry=StringToDouble(token,(char **) NULL);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             affine.sy=StringToDouble(token,(char **) NULL);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             affine.tx=StringToDouble(token,(char **) NULL);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             affine.ty=StringToDouble(token,(char **) NULL);
             break;
           }
@@ -1862,7 +1864,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
           }
         if (LocaleCompare("border-color",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) QueryColorDatabase(token,&graphic_context[n]->border_color,
               &image->exception);
             break;
@@ -1878,7 +1880,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             /*
               Create clip mask.
             */
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) CloneString(&graphic_context[n]->clip_mask,token);
             (void) DrawClipPath(image,graphic_context[n],
               graphic_context[n]->clip_mask);
@@ -1889,7 +1891,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             ssize_t
               fill_rule;
 
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             fill_rule=ParseCommandOption(MagickFillRuleOptions,MagickFalse,
               token);
             if (fill_rule == -1)
@@ -1905,7 +1907,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             ssize_t
               clip_units;
 
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             clip_units=ParseCommandOption(MagickClipPathOptions,MagickFalse,
               token);
             if (clip_units == -1)
@@ -1946,7 +1948,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             ssize_t
               decorate;
 
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             decorate=ParseCommandOption(MagickDecorateOptions,MagickFalse,
               token);
             if (decorate == -1)
@@ -1962,7 +1964,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             ssize_t
               direction;
 
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             direction=ParseCommandOption(MagickDirectionOptions,MagickFalse,
               token);
             if (direction == -1)
@@ -1984,7 +1986,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
           }
         if (LocaleCompare("encoding",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) CloneString(&graphic_context[n]->encoding,token);
             break;
           }
@@ -1996,7 +1998,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
       {
         if (LocaleCompare("fill",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(pattern,MaxTextExtent,"%s",token);
             if (GetImageArtifact(image,pattern) != (const char *) NULL)
               (void) DrawPatternPath(image,draw_info,token,
@@ -2023,7 +2025,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
           }
         if (LocaleCompare("fill-opacity",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             factor=strchr(token,'%') != (char *) NULL ? 0.01 : 1.0;
             graphic_context[n]->fill.opacity=ClampToQuantum((MagickRealType)
               QuantumRange*(1.0-factor*StringToDouble(token,(char **) NULL)));
@@ -2034,7 +2036,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             ssize_t
               fill_rule;
 
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             fill_rule=ParseCommandOption(MagickFillRuleOptions,MagickFalse,
               token);
             if (fill_rule == -1)
@@ -2047,7 +2049,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
           }
         if (LocaleCompare("font",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) CloneString(&graphic_context[n]->font,token);
             if (LocaleCompare("none",token) == 0)
               graphic_context[n]->font=(char *)
@@ -2056,13 +2058,13 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
           }
         if (LocaleCompare("font-family",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) CloneString(&graphic_context[n]->family,token);
             break;
           }
         if (LocaleCompare("font-size",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             graphic_context[n]->pointsize=StringToDouble(token,(char **) NULL);
             break;
           }
@@ -2071,7 +2073,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             ssize_t
               stretch;
 
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             stretch=ParseCommandOption(MagickStretchOptions,MagickFalse,token);
             if (stretch == -1)
               {
@@ -2086,7 +2088,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             ssize_t
               style;
 
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             style=ParseCommandOption(MagickStyleOptions,MagickFalse,token);
             if (style == -1)
               {
@@ -2101,7 +2103,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             ssize_t
               weight;
 
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             weight=ParseCommandOption(MagickWeightOptions,MagickFalse,
               token);
             if (weight == -1)
@@ -2117,7 +2119,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
       {
         if (LocaleCompare("gradient-units",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             break;
           }
         if (LocaleCompare("gravity",keyword) == 0)
@@ -2125,7 +2127,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             ssize_t
               gravity;
 
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             gravity=ParseCommandOption(MagickGravityOptions,MagickFalse,token);
             if (gravity == -1)
               {
@@ -2147,7 +2149,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
               compose;
 
             primitive_type=ImagePrimitive;
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             compose=ParseCommandOption(MagickComposeOptions,MagickFalse,token);
             if (compose == -1)
               {
@@ -2159,14 +2161,14 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
           }
         if (LocaleCompare("interline-spacing",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             graphic_context[n]->interline_spacing=StringToDouble(token,
               (char **) NULL);
             break;
           }
         if (LocaleCompare("interword-spacing",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             graphic_context[n]->interword_spacing=StringToDouble(token,
               (char **) NULL);
             break;
@@ -2179,7 +2181,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
       {
         if (LocaleCompare("kerning",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             graphic_context[n]->kerning=StringToDouble(token,(char **) NULL);
             break;
           }
@@ -2213,12 +2215,12 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
       {
         if (LocaleCompare("offset",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             break;
           }
         if (LocaleCompare("opacity",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             factor=strchr(token,'%') != (char *) NULL ? 0.01 : 1.0;
             graphic_context[n]->opacity=ClampToQuantum((MagickRealType)
               QuantumRange*(1.0-((1.0-QuantumScale*graphic_context[n]->opacity)*
@@ -2255,7 +2257,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
           }
         if (LocaleCompare("pop",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (LocaleCompare("clip-path",token) == 0)
               break;
             if (LocaleCompare("defs",token) == 0)
@@ -2287,27 +2289,27 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
           }
         if (LocaleCompare("push",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (LocaleCompare("clip-path",token) == 0)
               {
                 char
                   name[MaxTextExtent];
 
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 (void) FormatLocaleString(name,MaxTextExtent,"%s",token);
                 for (p=q; *q != '\0'; )
                 {
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                   if (LocaleCompare(token,"pop") != 0)
                     continue;
-                  GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
+                  GetNextToken(q,(const char **) NULL,extent,token);
                   if (LocaleCompare(token,"clip-path") != 0)
                     continue;
                   break;
                 }
                 (void) CopyMagickString(token,p,(size_t) (q-p-4+1));
                 (void) SetImageArtifact(image,name,token);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 break;
               }
             if (LocaleCompare("gradient",token) == 0)
@@ -2320,36 +2322,36 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
                 SegmentInfo
                   segment;
 
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 (void) CopyMagickString(name,token,MaxTextExtent);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 (void) CopyMagickString(type,token,MaxTextExtent);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 segment.x1=StringToDouble(token,(char **) NULL);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 if (*token == ',')
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                 segment.y1=StringToDouble(token,(char **) NULL);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 if (*token == ',')
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                 segment.x2=StringToDouble(token,(char **) NULL);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 if (*token == ',')
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                 segment.y2=StringToDouble(token,(char **) NULL);
                 if (LocaleCompare(type,"radial") == 0)
                   {
-                    GetNextToken(q,&q,MaxTextExtent,token);
+                    GetNextToken(q,&q,extent,token);
                     if (*token == ',')
-                      GetNextToken(q,&q,MaxTextExtent,token);
+                      GetNextToken(q,&q,extent,token);
                   }
                 for (p=q; *q != '\0'; )
                 {
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                   if (LocaleCompare(token,"pop") != 0)
                     continue;
-                  GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
+                  GetNextToken(q,(const char **) NULL,extent,token);
                   if (LocaleCompare(token,"gradient") != 0)
                     continue;
                   break;
@@ -2378,7 +2380,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
                   MagickMax(fabs(bounds.y2-bounds.y1+1.0),1.0),
                   bounds.x1,bounds.y1);
                 (void) SetImageArtifact(image,key,geometry);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 break;
               }
             if (LocaleCompare("pattern",token) == 0)
@@ -2386,32 +2388,32 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
                 RectangleInfo
                   bounds;
 
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 (void) CopyMagickString(name,token,MaxTextExtent);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 bounds.x=(ssize_t) ceil(StringToDouble(token,(char **) NULL)-
                   0.5);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 if (*token == ',')
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                 bounds.y=(ssize_t) ceil(StringToDouble(token,(char **) NULL)-
                   0.5);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 if (*token == ',')
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                 bounds.width=(size_t) floor(StringToDouble(token,
                   (char **) NULL)+0.5);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 if (*token == ',')
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                 bounds.height=(size_t) floor(StringToDouble(token,
                   (char **) NULL)+0.5);
                 for (p=q; *q != '\0'; )
                 {
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                   if (LocaleCompare(token,"pop") != 0)
                     continue;
-                  GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
+                  GetNextToken(q,(const char **) NULL,extent,token);
                   if (LocaleCompare(token,"pattern") != 0)
                     continue;
                   break;
@@ -2424,7 +2426,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
                   "%.20gx%.20g%+.20g%+.20g",(double) bounds.width,(double)
                   bounds.height,(double) bounds.x,(double) bounds.y);
                 (void) SetImageArtifact(image,key,geometry);
-                GetNextToken(q,&q,MaxTextExtent,token);
+                GetNextToken(q,&q,extent,token);
                 break;
               }
             if (LocaleCompare("graphic-context",token) == 0)
@@ -2461,7 +2463,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
           }
         if (LocaleCompare("rotate",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             angle=StringToDouble(token,(char **) NULL);
             affine.sx=cos(DegreesToRadians(fmod((double) angle,360.0)));
             affine.rx=sin(DegreesToRadians(fmod((double) angle,360.0)));
@@ -2482,24 +2484,24 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
       {
         if (LocaleCompare("scale",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             affine.sx=StringToDouble(token,(char **) NULL);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             affine.sy=StringToDouble(token,(char **) NULL);
             break;
           }
         if (LocaleCompare("skewX",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             angle=StringToDouble(token,(char **) NULL);
             affine.ry=sin(DegreesToRadians(angle));
             break;
           }
         if (LocaleCompare("skewY",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             angle=StringToDouble(token,(char **) NULL);
             affine.rx=(-tan(DegreesToRadians(angle)/2.0));
             break;
@@ -2512,7 +2514,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             PixelPacket
               stop_color;
 
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) QueryColorDatabase(token,&stop_color,&image->exception);
             type=LinearGradient;
             if (draw_info->gradient.type == RadialGradient)
@@ -2520,12 +2522,12 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             (void) GradientImage(image,type,PadSpread,&start_color,
               &stop_color);
             start_color=stop_color;
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             break;
           }
         if (LocaleCompare("stroke",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(pattern,MaxTextExtent,"%s",token);
             if (GetImageArtifact(image,pattern) != (const char *) NULL)
               (void) DrawPatternPath(image,draw_info,token,
@@ -2552,7 +2554,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
           }
         if (LocaleCompare("stroke-antialias",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             graphic_context[n]->stroke_antialias=
               StringToLong(token) != 0 ? MagickTrue : MagickFalse;
             break;
@@ -2568,14 +2570,14 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
                   *p;
 
                 p=q;
-                GetNextToken(p,&p,MaxTextExtent,token);
+                GetNextToken(p,&p,extent,token);
                 if (*token == ',')
-                  GetNextToken(p,&p,MaxTextExtent,token);
+                  GetNextToken(p,&p,extent,token);
                 for (x=0; IsPoint(token) != MagickFalse; x++)
                 {
-                  GetNextToken(p,&p,MaxTextExtent,token);
+                  GetNextToken(p,&p,extent,token);
                   if (*token == ',')
-                    GetNextToken(p,&p,MaxTextExtent,token);
+                    GetNextToken(p,&p,extent,token);
                 }
                 graphic_context[n]->dash_pattern=(double *)
                   AcquireQuantumMemory((size_t) (2UL*x+1UL),
@@ -2589,9 +2591,9 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
                   }
                 for (j=0; j < x; j++)
                 {
-                  GetNextToken(q,&q,MaxTextExtent,token);
+                  GetNextToken(q,&q,extent,token);
                   if (*token == ',')
-                    GetNextToken(q,&q,MaxTextExtent,token);
+                    GetNextToken(q,&q,extent,token);
                   graphic_context[n]->dash_pattern[j]=StringToDouble(token,
                     (char **) NULL);
                 }
@@ -2602,12 +2604,12 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
                 graphic_context[n]->dash_pattern[j]=0.0;
                 break;
               }
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             break;
           }
         if (LocaleCompare("stroke-dashoffset",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             graphic_context[n]->dash_offset=StringToDouble(token,
               (char **) NULL);
             break;
@@ -2617,7 +2619,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             ssize_t
               linecap;
 
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             linecap=ParseCommandOption(MagickLineCapOptions,MagickFalse,token);
             if (linecap == -1)
               {
@@ -2632,7 +2634,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             ssize_t
               linejoin;
 
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             linejoin=ParseCommandOption(MagickLineJoinOptions,MagickFalse,
               token);
             if (linejoin == -1)
@@ -2645,13 +2647,13 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
           }
         if (LocaleCompare("stroke-miterlimit",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             graphic_context[n]->miterlimit=StringToUnsignedLong(token);
             break;
           }
         if (LocaleCompare("stroke-opacity",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             factor=strchr(token,'%') != (char *) NULL ? 0.01 : 1.0;
             graphic_context[n]->stroke.opacity=ClampToQuantum((MagickRealType)
               QuantumRange*(1.0-factor*StringToDouble(token,(char **) NULL)));
@@ -2659,7 +2661,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
           }
         if (LocaleCompare("stroke-width",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             graphic_context[n]->stroke_width=StringToDouble(token,
               (char **) NULL);
             break;
@@ -2680,7 +2682,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             ssize_t
               align;
 
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             align=ParseCommandOption(MagickAlignOptions,MagickFalse,token);
             if (align == -1)
               {
@@ -2695,7 +2697,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             ssize_t
               align;
 
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             align=ParseCommandOption(MagickAlignOptions,MagickFalse,token);
             if (align == -1)
               {
@@ -2707,25 +2709,25 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
           }
         if (LocaleCompare("text-antialias",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             graphic_context[n]->text_antialias=
               StringToLong(token) != 0 ? MagickTrue : MagickFalse;
             break;
           }
         if (LocaleCompare("text-undercolor",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             (void) QueryColorDatabase(token,&graphic_context[n]->undercolor,
               &image->exception);
             break;
           }
         if (LocaleCompare("translate",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             affine.tx=StringToDouble(token,(char **) NULL);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             affine.ty=StringToDouble(token,(char **) NULL);
             break;
           }
@@ -2737,22 +2739,22 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
       {
         if (LocaleCompare("viewbox",keyword) == 0)
           {
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             graphic_context[n]->viewbox.x=(ssize_t) ceil(StringToDouble(token,
               (char **) NULL)-0.5);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             graphic_context[n]->viewbox.y=(ssize_t) ceil(StringToDouble(token,
               (char **) NULL)-0.5);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             graphic_context[n]->viewbox.width=(size_t) floor(StringToDouble(
               token,(char **) NULL)+0.5);
-            GetNextToken(q,&q,MaxTextExtent,token);
+            GetNextToken(q,&q,extent,token);
             if (*token == ',')
-              GetNextToken(q,&q,MaxTextExtent,token);
+              GetNextToken(q,&q,extent,token);
             graphic_context[n]->viewbox.height=(size_t) floor(StringToDouble(
               token,(char **) NULL)+0.5);
             break;
@@ -2801,15 +2803,15 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
       */
       if (IsPoint(q) == MagickFalse)
         break;
-      GetNextToken(q,&q,MaxTextExtent,token);
+      GetNextToken(q,&q,extent,token);
       point.x=StringToDouble(token,(char **) NULL);
-      GetNextToken(q,&q,MaxTextExtent,token);
+      GetNextToken(q,&q,extent,token);
       if (*token == ',')
-        GetNextToken(q,&q,MaxTextExtent,token);
+        GetNextToken(q,&q,extent,token);
       point.y=StringToDouble(token,(char **) NULL);
-      GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
+      GetNextToken(q,(const char **) NULL,extent,token);
       if (*token == ',')
-        GetNextToken(q,&q,MaxTextExtent,token);
+        GetNextToken(q,&q,extent,token);
       primitive_info[i].primitive=primitive_type;
       primitive_info[i].point=point;
       primitive_info[i].coordinates=0;
@@ -2889,7 +2891,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
           *s,
           *t;
 
-        GetNextToken(q,&q,MaxTextExtent,token);
+        GetNextToken(q,&q,extent,token);
         length=1;
         t=token;
         for (s=token; *s != '\0'; s=t)
@@ -3066,7 +3068,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             status=MagickFalse;
             break;
           }
-        GetNextToken(q,&q,MaxTextExtent,token);
+        GetNextToken(q,&q,extent,token);
         method=ParseCommandOption(MagickMethodOptions,MagickFalse,token);
         if (method == -1)
           {
@@ -3084,7 +3086,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             break;
           }
         if (*token != ',')
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         primitive_info[j].text=AcquireString(token);
         break;
       }
@@ -3095,7 +3097,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             status=MagickFalse;
             break;
           }
-        GetNextToken(q,&q,MaxTextExtent,token);
+        GetNextToken(q,&q,extent,token);
         primitive_info[j].text=AcquireString(token);
         break;
       }
diff --git a/magick/locale.c b/magick/locale.c
index 30817ba30f..ff04394e41 100644
--- a/magick/locale.c
+++ b/magick/locale.c
@@ -1079,7 +1079,7 @@ MagickExport MagickBooleanType ListLocaleInfo(FILE *file,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   L o a d L o c a l e L i s t                                               %
++   L o a d L o c a l e C a c h e                                             %
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -1170,6 +1170,9 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache,
   register char
     *p;
 
+  size_t
+    extent;
+
   /*
     Read the locale configure file.
   */
@@ -1184,12 +1187,13 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache,
   *keyword='\0';
   fatal_handler=SetFatalErrorHandler(LocaleFatalErrorHandler);
   token=AcquireString(xml);
+  extent=strlen(token)+MaxTextExtent;
   for (q=(char *) xml; *q != '\0'; )
   {
     /*
       Interpret XML.
     */
-    GetNextToken(q,&q,MaxTextExtent,token);
+    GetNextToken(q,&q,extent,token);
     if (*token == '\0')
       break;
     (void) CopyMagickString(keyword,token,MaxTextExtent);
@@ -1200,7 +1204,7 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache,
         */
         while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
         {
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           while (isspace((int) ((unsigned char) *q)) != 0)
             q++;
         }
@@ -1213,7 +1217,7 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache,
         */
         while ((LocaleNCompare(q,"->",2) != 0) && (*q != '\0'))
         {
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           while (isspace((int) ((unsigned char) *q)) != 0)
             q++;
         }
@@ -1227,10 +1231,10 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache,
         while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
         {
           (void) CopyMagickString(keyword,token,MaxTextExtent);
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (*token != '=')
             continue;
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (LocaleCompare(keyword,"locale") == 0)
             {
               if (LocaleCompare(locale,token) != 0)
@@ -1277,10 +1281,10 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache,
         while ((*token != '>') && (*q != '\0'))
         {
           (void) CopyMagickString(keyword,token,MaxTextExtent);
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (*token != '=')
             continue;
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         }
         continue;
       }
@@ -1302,10 +1306,10 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache,
         while ((*token != '>') && (*q != '\0'))
         {
           (void) CopyMagickString(keyword,token,MaxTextExtent);
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (*token != '=')
             continue;
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (LocaleCompare(keyword,"name") == 0)
             {
               (void) ConcatenateMagickString(tag,token,MaxTextExtent);
@@ -1364,7 +1368,7 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache,
         (void) ConcatenateMagickString(tag,"/",MaxTextExtent);
         continue;
       }
-    GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
+    GetNextToken(q,(const char **) NULL,extent,token);
     if (*token != '=')
       continue;
   }
diff --git a/magick/log.c b/magick/log.c
index 8e33474d9f..ec81a912b1 100644
--- a/magick/log.c
+++ b/magick/log.c
@@ -1396,7 +1396,7 @@ MagickBooleanType LogMagickEvent(const LogEventType type,const char *module,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   L o a d L o g L i s t                                                     %
++   L o a d L o g C a c h e                                                   %
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -1437,19 +1437,23 @@ static MagickBooleanType LoadLogCache(LinkedListInfo *log_cache,const char *xml,
   MagickStatusType
     status;
 
+  size_t
+    extent;
+
   /*
     Load the log map file.
   */
   if (xml == (const char *) NULL)
     return(MagickFalse);
   status=MagickTrue;
-  token=AcquireString((const char *) xml);
+  token=AcquireString(xml);
+  extent=strlen(token)+MaxTextExtent;
   for (q=(const char *) xml; *q != '\0'; )
   {
     /*
       Interpret XML.
     */
-    GetNextToken(q,&q,MaxTextExtent,token);
+    GetNextToken(q,&q,extent,token);
     if (*token == '\0')
       break;
     (void) CopyMagickString(keyword,token,MaxTextExtent);
@@ -1459,7 +1463,7 @@ static MagickBooleanType LoadLogCache(LinkedListInfo *log_cache,const char *xml,
           Doctype element.
         */
         while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         continue;
       }
     if (LocaleNCompare(keyword,"<!--",4) == 0)
@@ -1468,7 +1472,7 @@ static MagickBooleanType LoadLogCache(LinkedListInfo *log_cache,const char *xml,
           Comment element.
         */
         while ((LocaleNCompare(q,"->",2) != 0) && (*q != '\0'))
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         continue;
       }
     if (LocaleCompare(keyword,"<include") == 0)
@@ -1479,10 +1483,10 @@ static MagickBooleanType LoadLogCache(LinkedListInfo *log_cache,const char *xml,
         while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
         {
           (void) CopyMagickString(keyword,token,MaxTextExtent);
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (*token != '=')
             continue;
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (LocaleCompare(keyword,"file") == 0)
             {
               if (depth > 200)
@@ -1539,11 +1543,11 @@ static MagickBooleanType LoadLogCache(LinkedListInfo *log_cache,const char *xml,
         log_info=(LogInfo *) NULL;
         continue;
       }
-    GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
+    GetNextToken(q,(const char **) NULL,extent,token);
     if (*token != '=')
       continue;
-    GetNextToken(q,&q,MaxTextExtent,token);
-    GetNextToken(q,&q,MaxTextExtent,token);
+    GetNextToken(q,&q,extent,token);
+    GetNextToken(q,&q,extent,token);
     switch (*keyword)
     {
       case 'E':
diff --git a/magick/magic.c b/magick/magic.c
index 96779606e1..e7e3063261 100644
--- a/magick/magic.c
+++ b/magick/magic.c
@@ -740,7 +740,7 @@ MagickExport MagickBooleanType ListMagicInfo(FILE *file,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   L o a d M a g i c L i s t                                                 %
++   L o a d M a g i c C a c h e                                               %
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -783,6 +783,9 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *magic_cache,
   MagickStatusType
     status;
 
+  size_t
+    extent;
+
   /*
     Load the magic map file.
   */
@@ -793,12 +796,13 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *magic_cache,
   status=MagickTrue;
   magic_info=(MagicInfo *) NULL;
   token=AcquireString(xml);
+  extent=strlen(token)+MaxTextExtent;
   for (q=(char *) xml; *q != '\0'; )
   {
     /*
       Interpret XML.
     */
-    GetNextToken(q,&q,MaxTextExtent,token);
+    GetNextToken(q,&q,extent,token);
     if (*token == '\0')
       break;
     (void) CopyMagickString(keyword,token,MaxTextExtent);
@@ -808,7 +812,7 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *magic_cache,
           Doctype element.
         */
         while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         continue;
       }
     if (LocaleNCompare(keyword,"<!--",4) == 0)
@@ -817,7 +821,7 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *magic_cache,
           Comment element.
         */
         while ((LocaleNCompare(q,"->",2) != 0) && (*q != '\0'))
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         continue;
       }
     if (LocaleCompare(keyword,"<include") == 0)
@@ -828,10 +832,10 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *magic_cache,
         while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
         {
           (void) CopyMagickString(keyword,token,MaxTextExtent);
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (*token != '=')
             continue;
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (LocaleCompare(keyword,"file") == 0)
             {
               if (depth > 200)
@@ -889,11 +893,11 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *magic_cache,
         magic_info=(MagicInfo *) NULL;
         continue;
       }
-    GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
+    GetNextToken(q,(const char **) NULL,extent,token);
     if (*token != '=')
       continue;
-    GetNextToken(q,&q,MaxTextExtent,token);
-    GetNextToken(q,&q,MaxTextExtent,token);
+    GetNextToken(q,&q,extent,token);
+    GetNextToken(q,&q,extent,token);
     switch (*keyword)
     {
       case 'N':
diff --git a/magick/methods.h b/magick/methods.h
index 06890f5181..6ec1de1540 100644
--- a/magick/methods.h
+++ b/magick/methods.h
@@ -507,7 +507,6 @@ extern "C" {
 #define GetMagickResource  PrependMagickMethod(GetMagickResource)
 #define GetMagickSeekableStream  PrependMagickMethod(GetMagickSeekableStream)
 #define GetMagickThreadSupport  PrependMagickMethod(GetMagickThreadSupport)
-#define GetNextToken  PrependMagickMethod(GetNextToken)
 #define GetMagickVersion  PrependMagickMethod(GetMagickVersion)
 #define GetMagicList  PrependMagickMethod(GetMagicList)
 #define GetMagicName  PrependMagickMethod(GetMagicName)
@@ -529,6 +528,7 @@ extern "C" {
 #define GetNextImageRegistry  PrependMagickMethod(GetNextImageRegistry)
 #define GetNextKeyInHashmap  PrependMagickMethod(GetNextKeyInHashmap)
 #define GetNextKeyInSplayTree  PrependMagickMethod(GetNextKeyInSplayTree)
+#define GetNextToken  PrependMagickMethod(GetNextToken)
 #define GetNextValueInHashmap  PrependMagickMethod(GetNextValueInHashmap)
 #define GetNextValueInLinkedList  PrependMagickMethod(GetNextValueInLinkedList)
 #define GetNextValueInSplayTree  PrependMagickMethod(GetNextValueInSplayTree)
diff --git a/magick/nt-feature.c b/magick/nt-feature.c
index a9f5591637..c973ceede8 100644
--- a/magick/nt-feature.c
+++ b/magick/nt-feature.c
@@ -410,7 +410,7 @@ MagickExport MagickBooleanType NTAcquireTypeCache(SplayTreeInfo *type_cache,
         family_extent=value_name;
         for (q=value_name; *q != '\0'; )
         {
-            GetNextToken(q,(const char **) &q,token);
+            GetNextToken(q,(const char **) &q,MaxTextExtent,token);
             if (*token == '\0')
               break;
 
diff --git a/magick/policy.c b/magick/policy.c
index 7a9c4d4317..e85e8fb926 100644
--- a/magick/policy.c
+++ b/magick/policy.c
@@ -702,7 +702,7 @@ MagickExport MagickBooleanType ListPolicyInfo(FILE *file,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   L o a d P o l i c y L i s t                                               %
++   L o a d P o l i c y C a c h e                                             %
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -745,6 +745,9 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *policy_cache,
   PolicyInfo
     *policy_info;
 
+  size_t
+    extent;
+
   /*
     Load the policy map file.
   */
@@ -755,12 +758,13 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *policy_cache,
   status=MagickTrue;
   policy_info=(PolicyInfo *) NULL;
   token=AcquireString(xml);
+  extent=strlen(token)+MaxTextExtent;
   for (q=(const char *) xml; *q != '\0'; )
   {
     /*
       Interpret XML.
     */
-    GetNextToken(q,&q,MaxTextExtent,token);
+    GetNextToken(q,&q,extent,token);
     if (*token == '\0')
       break;
     (void) CopyMagickString(keyword,token,MaxTextExtent);
@@ -770,7 +774,7 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *policy_cache,
           Docdomain element.
         */
         while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         continue;
       }
     if (LocaleNCompare(keyword,"<!--",4) == 0)
@@ -779,7 +783,7 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *policy_cache,
           Comment element.
         */
         while ((LocaleNCompare(q,"->",2) != 0) && (*q != '\0'))
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         continue;
       }
     if (LocaleCompare(keyword,"<include") == 0)
@@ -790,10 +794,10 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *policy_cache,
         while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
         {
           (void) CopyMagickString(keyword,token,MaxTextExtent);
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (*token != '=')
             continue;
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (LocaleCompare(keyword,"file") == 0)
             {
               if (depth > 200)
@@ -851,11 +855,11 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *policy_cache,
         policy_info=(PolicyInfo *) NULL;
         continue;
       }
-    GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
+    GetNextToken(q,(const char **) NULL,extent,token);
     if (*token != '=')
       continue;
-    GetNextToken(q,&q,MaxTextExtent,token);
-    GetNextToken(q,&q,MaxTextExtent,token);
+    GetNextToken(q,&q,extent,token);
+    GetNextToken(q,&q,extent,token);
     switch (*keyword)
     {
       case 'D':
diff --git a/magick/token.c b/magick/token.c
index f44a068f85..4ef90d8a2d 100644
--- a/magick/token.c
+++ b/magick/token.c
@@ -146,7 +146,7 @@ MagickExport TokenInfo *DestroyTokenInfo(TokenInfo *token_info)
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  GetNextToken() gets a lexeme from the token stream.  A token is defined as
+%  GetNextToken() gets a token from the token stream.  A token is defined as
 %  a sequence of characters delimited by whitespace (e.g. clip-path), a
 %  sequence delimited with quotes (.e.g "Quote me"), or a sequence enclosed in
 %  parenthesis (e.g. rgb(0,0,0)).  GetNextToken() also recognizes these
diff --git a/magick/type.c b/magick/type.c
index ab15f63f6d..d6209fe60a 100644
--- a/magick/type.c
+++ b/magick/type.c
@@ -1001,7 +1001,7 @@ MagickExport MagickBooleanType ListTypeInfo(FILE *file,ExceptionInfo *exception)
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   L o a d T y p e L i s t                                                   %
++   L o a d T y p e C a c h e                                                 %
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -1079,6 +1079,9 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache,
   MagickStatusType
     status;
 
+  size_t
+    extent;
+
   TypeInfo
     *type_info;
 
@@ -1092,6 +1095,7 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache,
   status=MagickTrue;
   type_info=(TypeInfo *) NULL;
   token=AcquireString(xml);
+  extent=strlen(token)+MaxTextExtent;
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
   /*
     Determine the Ghostscript font path.
@@ -1105,7 +1109,7 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache,
     /*
       Interpret XML.
     */
-    GetNextToken(q,&q,MaxTextExtent,token);
+    GetNextToken(q,&q,extent,token);
     if (*token == '\0')
       break;
     (void) CopyMagickString(keyword,token,MaxTextExtent);
@@ -1115,7 +1119,7 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache,
           Doctype element.
         */
         while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         continue;
       }
     if (LocaleNCompare(keyword,"<!--",4) == 0)
@@ -1124,7 +1128,7 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache,
           Comment element.
         */
         while ((LocaleNCompare(q,"->",2) != 0) && (*q != '\0'))
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
         continue;
       }
     if (LocaleCompare(keyword,"<include") == 0)
@@ -1135,10 +1139,10 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache,
         while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
         {
           (void) CopyMagickString(keyword,token,MaxTextExtent);
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (*token != '=')
             continue;
-          GetNextToken(q,&q,MaxTextExtent,token);
+          GetNextToken(q,&q,extent,token);
           if (LocaleCompare(keyword,"file") == 0)
             {
               if (depth > 200)
@@ -1200,11 +1204,11 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache,
         type_info=(TypeInfo *) NULL;
         continue;
       }
-    GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
+    GetNextToken(q,(const char **) NULL,extent,token);
     if (*token != '=')
       continue;
-    GetNextToken(q,&q,MaxTextExtent,token);
-    GetNextToken(q,&q,MaxTextExtent,token);
+    GetNextToken(q,&q,extent,token);
+    GetNextToken(q,&q,extent,token);
     switch (*keyword)
     {
       case 'E':