Added extra check to prevent replacing a non-breaking space with a ne…

…wline.
ImageMagick · Oct 3, 2021 · 6e82f6f · 6e82f6f
1 parent 1d59719
commit 6e82f6f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/magick/annotate.c b/magick/annotate.c
@@ -635,7 +635,8 @@ MagickExport ssize_t FormatMagickCaption(Image *image,DrawInfo *draw_info,
         q=draw_info->text;
         continue;
       }
-    if (IsUTFSpace(code) != MagickFalse)
+    if ((IsUTFSpace(code) != MagickFalse) &&
+        (IsNonBreakingUTFSpace(code) == MagickFalse))
       {
         s=p;
         if (width > image->columns)

diff --git a/magick/token-private.h b/magick/token-private.h
@@ -149,6 +149,13 @@ static inline unsigned int GetUTFOctets(const char *magick_restrict text)
   return(octets);
 }
 
+static inline MagickBooleanType IsNonBreakingUTFSpace(int code)
+{
+  if (code == 0x00a0)
+    return(MagickTrue);
+  return(MagickFalse);
+}
+
 static inline MagickBooleanType IsUTFSpace(int code)
 {
   if (((code >= 0x0009) && (code <= 0x000d)) || (code == 0x0020) ||