(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 3980525e3f4e7e2a2425525ad9e1b4a10e50bd6b..570dd5109a61f779b9b071e4918389f91bc8145f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 2011-03-25 6.6.8-8 Cristy  <quetzlzacatenango@image...>
   * Fix memory access bug in CloneString() (reference
     http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=18382).
+  * Avoid infinite loop when no space is available in MagickFormatCaption().
 
 2011-03-25 6.6.8-8 Anthony Thyssen <A.Thyssen@griffith...>
   * Removed the fix for %p and %n escapes, as it was not working right

diff --git a/ImageMagick.spec b/ImageMagick.spec
index f1d8ae2e7f291b25caff5b64731b38b61c81dccc..aa3355bb7ae7ea35446378981b0ff7fcb4932683 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %global VERSION  6.6.8
-%global Patchlevel  9
+%global Patchlevel  8
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/config/configure.xml b/config/configure.xml
index f637aab47f98d9a0724261534684332cc140aeb1..c41bc2df7e0daeeb2b01f29502328eb4baedfed7 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="VERSION" value="6.6.8"/>
   <configure name="LIB_VERSION" value="0x668"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,8,9"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,8,8"/>
   <configure name="RELEASE_DATE" value="2011-03-25"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index b59692efd87ad1bf0e0c4c6df0ef17719ece1453..0527a21bdb0e1adfefe2abb37f4f3d32a8f4485c 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ImageMagick) 6.6.8-9
+# Generated automatically by config.status (ImageMagick) 6.6.8-8
 # Libtool was configured on host magick.imagemagick.org:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #

diff --git a/magick/annotate.c b/magick/annotate.c
index 74e7c73765ccb59fb55425287dbfb8c4d83ff3e5..3d30b52b309c9b919c678f9815489013d69256bb 100644 (file)
--- a/magick/annotate.c
+++ b/magick/annotate.c
@@ -535,6 +535,9 @@ MagickExport MagickBooleanType AnnotateImage(Image *image,
 MagickExport ssize_t FormatMagickCaption(Image *image,DrawInfo *draw_info,
   const MagickBooleanType split,TypeMetric *metrics,char **caption)
 {
+  char
+    *snippet;
+
   MagickBooleanType
     status;
 
@@ -551,8 +554,16 @@ MagickExport ssize_t FormatMagickCaption(Image *image,DrawInfo *draw_info,
 
   q=draw_info->text;
   s=(char *) NULL;
+  snippet=(char *) NULL;
   for (p=(*caption); GetUTFCode(p) != 0; p+=GetUTFOctets(p))
   {
+    if (snippet != (char *) NULL)
+      {
+        if ((p != (char *) NULL) && (memcmp(p,snippet,strlen(p)) == 0))
+          break;  /* caption won't fit in allotted space */
+        snippet=DestroyString(snippet);
+      }
+    snippet=AcquireString(p);
     if (IsUTFSpace(GetUTFCode(p)) != MagickFalse)
       s=p;
     for (i=0; i < (ssize_t) GetUTFOctets(p); i++)
@@ -601,6 +612,8 @@ MagickExport ssize_t FormatMagickCaption(Image *image,DrawInfo *draw_info,
     s=(char *) NULL;
     q=draw_info->text;
   }
+  if (snippet != (char *) NULL)
+    snippet=DestroyString(snippet);
   i=0;
   for (p=(*caption); GetUTFCode(p) != 0; p+=GetUTFOctets(p))
     if (GetUTFCode(p) == '\n')

diff --git a/magick/version.h b/magick/version.h
index 64011ad18cb70fca6d9b7ab7ee1a59ebe09e0651..e3c93df4fc3eaf97233171409bf84be2f54d4cc4 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x668
 #define MagickLibVersionText  "6.6.8"
 #define MagickLibVersionNumber  4,0,1
-#define MagickLibAddendum  "-9"
+#define MagickLibAddendum  "-8"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
 #define MagickReleaseDate  "2011-03-25"

diff --git a/version.sh b/version.sh
index 4e5fa182cbea79676f54dc007b6fa58278dcc80a..eb5c76f1e874ef1780f729c27c314c84d9162f7e 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick'
 # PACKAGE_NAME (e.g. "1.0.0").
 PACKAGE_VERSION='6.6.8'
 PACKAGE_LIB_VERSION="0x668"
-PACKAGE_RELEASE="9"
+PACKAGE_RELEASE="8"
 PACKAGE_LIB_VERSION_NUMBER="6,6,8,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"