]> granicus.if.org Git - imagemagick/commitdiff
Fixed memory leak.
authorDirk Lemstra <dirk@lemstra.org>
Mon, 8 Jul 2019 20:43:54 +0000 (22:43 +0200)
committerDirk Lemstra <dirk@lemstra.org>
Mon, 8 Jul 2019 20:43:54 +0000 (22:43 +0200)
MagickCore/annotate.c

index 397fdd57180ae6657182002759cda8c8865ea71e..eaf6b82246a5531b919b67ece6e6701d1e264068 100644 (file)
@@ -1765,10 +1765,10 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
     metrics->origin.y=(double) origin.y;
     if (metrics->origin.x > metrics->width)
       metrics->width=metrics->origin.x;
-    if (last_glyph.image != 0)
+    if (last_glyph.image != (FT_Glyph) NULL)
       {
         FT_Done_Glyph(last_glyph.image);
-        last_glyph.image=0;
+        last_glyph.image=(FT_Glyph) NULL;
       }
     last_glyph=glyph;
     code=GetUTFCode(p+grapheme[i].cluster);
@@ -1777,10 +1777,10 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
     grapheme=(GraphemeInfo *) RelinquishMagickMemory(grapheme);
   if (utf8 != (unsigned char *) NULL)
     utf8=(unsigned char *) RelinquishMagickMemory(utf8);
-  if (glyph.image != 0)
+  if (last_glyph.image != (FT_Glyph) NULL)
     {
-      FT_Done_Glyph(glyph.image);
-      glyph.image=0;
+      FT_Done_Glyph(last_glyph.image);
+      last_glyph.image=(FT_Glyph) NULL;
     }
   /*
     Determine font metrics.