Commit e05e45942 for imagemagick.org
commit e05e45942acc2847026ea52ec02a9d870caffd2c
Author: Cristy <urban-warrior@imagemagick.org>
Date: Sun Mar 29 07:38:13 2026 -0400
improve exception message
diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c
index d062073e6..be753c4d8 100644
--- a/MagickCore/xml-tree.c
+++ b/MagickCore/xml-tree.c
@@ -1913,14 +1913,19 @@ MagickExport XMLTreeInfo *NewXMLTree(const char *xml,ExceptionInfo *exception)
root=(XMLTreeRoot *) NewXMLTreeTag((char *) NULL);
length=strlen(xml);
utf8=ConvertUTF16ToUTF8(xml,&length);
- if ((utf8 == (char *) NULL) || (length == 0))
+ if (utf8 == (char *) NULL)
{
- if (utf8 != (char *) NULL)
- utf8=DestroyString(utf8);
(void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
"ParseError","UTF16 to UTF8 failed");
return((XMLTreeInfo *) NULL);
}
+ if (length == 0)
+ {
+ utf8=DestroyString(utf8);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
+ "ParseError","root tag missing");
+ return((XMLTreeInfo *) NULL);
+ }
terminal=utf8[length-1];
utf8[length-1]='\0';
p=utf8;