From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 26 Nov 2009 23:51:49 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~10336
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd899c2405cccabba47c8e6de18de1dddad06cf8;p=imagemagick

---

diff --git a/ChangeLog b/ChangeLog
index 209f89a53..c4b3d3358 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
+2009-11-26  6.5.8-1 Dr. Ingo Bremer <bremer@wias-...>
+  * Escape single quote in when writing the UIL format.
+
 2009-11-25  6.5.8-1 Jee Teck  <jee.teck@cteca...>
-  * The mogridy program +opaque option now recognizes its required argument.
+  * The mogrify program +opaque option now recognizes its required argument.
 
 2009-11-19  6.5.8-0 Cristy  <quetzlzacatenango@image...>
   * Add magick/morphlogy.{c,h} source templates.
diff --git a/coders/uil.c b/coders/uil.c
index 4cba0f986..b40f9a712 100644
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -160,7 +160,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image)
     basename[MaxTextExtent],
     buffer[MaxTextExtent],
     name[MaxTextExtent],
-    symbol[MaxTextExtent];
+    *symbol;
 
   ExceptionInfo
     *exception;
@@ -294,6 +294,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image)
   /*
     UIL header.
   */
+  symbol=AcquireString("");
   (void) WriteBlobString(image,"/* UIL */\n");
   GetPathComponent(image->filename,BasePath,basename);
   (void) FormatMagickString(buffer,MaxTextExtent,
@@ -324,6 +325,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image)
       symbol[j]=Cixel[k];
     }
     symbol[j]='\0';
+    (void) SubstituteString(&symbol,"'","''");
     if (LocaleCompare(name,"None") == 0)
       (void) FormatMagickString(buffer,MaxTextExtent,
         "    background color = '%s'",symbol);
@@ -372,6 +374,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image)
     if (status == MagickFalse)
       break;
   }
+  symbol=DestroyString(symbol);
   (void) CloseBlob(image);
   return(MagickTrue);
 }