From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 19 Aug 2011 13:59:45 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~7177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4aa314e7f9e09c30fcedcd112156b1dfb712b62d;p=imagemagick

---

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 822f3f885..9a2bfb3e3 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -568,13 +568,13 @@ MagickExport ssize_t FormatMagickCaption(Image *image,DrawInfo *draw_info,
     width=(size_t) floor(metrics->width+0.5);
     if (width <= image->columns)
       continue;
-    if (s != (char *) NULL)
+    if ((s != (char *) NULL) && (GetUTFOctets(s) == 1))
       {
         *s='\n';
         p=s;
       }
     else
-      if (split != MagickFalse)
+      if ((s != (char *) NULL) || (split != MagickFalse))
         {
           char
             *target;