From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 18 Aug 2018 15:44:31 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/1231
X-Git-Tag: 7.0.8-11~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91f31dde9e32cabc8a8caf83f1f6006075401ec3;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/1231
---

diff --git a/ChangeLog b/ChangeLog
index 4ba799c57..e7ef4cc02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-15  7.0.8-11 Cristy  <quetzlzacatenango@image...>
+  * Fixed numerous use of uninitialized values, integer overflow, memory
+    exceeded, and timeouts (credit to OSS Fuzz).
+
 2018-08-13  7.0.8-10 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.8-10, GIT revision 14646:48fba3256:20180813
 
diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index d3cf797c8..e19138761 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -1618,7 +1618,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
     */
     glyph.id=(FT_UInt) grapheme[i].index;
     if (glyph.id == 0)
-      glyph.id=FT_Get_Char_Index(face,'?');
+      glyph.id=FT_Get_Char_Index(face,' ');
     if ((glyph.id != 0) && (last_glyph.id != 0))
       origin.x+=(FT_Pos) (64.0*draw_info->kerning);
     glyph.origin=origin;