Skip to content

Commit 212564a

Browse files
author
Cristy
committed
prevent double free in Freetype streaming interface
1 parent 980bfe2 commit 212564a

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

magick/annotate.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1566,7 +1566,6 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
15661566
(void) FT_Done_FreeType(library);
15671567
ThrowFreetypeErrorException("UnrecognizedFontEncoding",ft_status,
15681568
encoding);
1569-
stream=(FT_StreamRec *) RelinquishMagickMemory(stream);
15701569
return(MagickFalse);
15711570
}
15721571
}
@@ -1599,7 +1598,6 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
15991598
(void) FT_Done_FreeType(library);
16001599
ThrowFreetypeErrorException("UnableToReadFont",ft_status,
16011600
draw_info->font);
1602-
stream=(FT_StreamRec *) RelinquishMagickMemory(stream);
16031601
return(MagickFalse);
16041602
}
16051603
metrics->pixels_per_em.x=face->size->metrics.x_ppem;
@@ -1637,7 +1635,6 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
16371635
{
16381636
(void) FT_Done_Face(face);
16391637
(void) FT_Done_FreeType(library);
1640-
stream=(FT_StreamRec *) RelinquishMagickMemory(stream);
16411638
return(MagickTrue);
16421639
}
16431640
/*
@@ -1956,7 +1953,6 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
19561953
annotate_info=DestroyDrawInfo(annotate_info);
19571954
(void) FT_Done_Face(face);
19581955
(void) FT_Done_FreeType(library);
1959-
stream=(FT_StreamRec *) RelinquishMagickMemory(stream);
19601956
return(status);
19611957
}
19621958
#else

0 commit comments

Comments
 (0)