(no commit message)

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 822f3f885321d5e6c6d38b8298f03dd7aa812386..9a2bfb3e34c1e6bcb598b624cb08d074ed5bae8a 100644 (file)
--- 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;