Commit 3fc646a49 for imagemagick.org
commit 3fc646a498eecda9163164046189f90dc677ae64
Author: Cristy <urban-warrior@imagemagick.org>
Date: Wed Jun 10 22:33:33 2026 -0400
https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-6jwg-7q3p-5fqm
diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index dcb88083e..f9f6b1325 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -1486,8 +1486,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
#define ThrowFreetypeErrorException(tag,ft_status,value) \
{ \
- const char \
- *error_string=FreetypeErrorMessage(ft_status); \
+ const char *error_string = FreetypeErrorMessage(ft_status); \
if (error_string != (const char *) NULL) \
(void) ThrowMagickException(exception,GetMagickModule(),TypeError, \
tag,"`%s (%s)'",value, error_string); \
@@ -1610,8 +1609,11 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
image->filename);
ft_status=FreetypeInit(memory,&library);
if (ft_status != 0)
- ThrowFreetypeErrorException("UnableToInitializeFreetypeLibrary",ft_status,
- image->filename);
+ {
+ ThrowFreetypeErrorException("UnableToInitializeFreetypeLibrary",ft_status,
+ image->filename);
+ return(MagickFalse);
+ }
/*
Open font face.
*/