From: Cristy Date: Wed, 7 Feb 2018 23:28:17 +0000 (-0500) Subject: ... X-Git-Tag: 7.0.7-23~104 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c390a0915231b64e8cbd73d68ac5453592ab13a2;p=imagemagick ... --- diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c index 914d98e4f..2acda45d0 100644 --- a/MagickCore/xml-tree.c +++ b/MagickCore/xml-tree.c @@ -1583,8 +1583,8 @@ static XMLTreeInfo *ParseCloseTag(XMLTreeRoot *root,char *tag, return((XMLTreeInfo *) NULL); } -static MagickBooleanType ValidateEntities(char *tag,char *xml,char **entities, - const size_t depth) +static MagickBooleanType ValidateEntities(char *tag,char *xml, + const size_t depthm,char **entities) { register ssize_t i; @@ -1607,7 +1607,7 @@ static MagickBooleanType ValidateEntities(char *tag,char *xml,char **entities, (strncmp(entities[i],xml+1,strlen(entities[i])) == 0)) i+=2; if ((entities[i] != (char *) NULL) && - (ValidateEntities(tag,entities[i+1],entities,depth) == 0)) + (ValidateEntities(tag,entities[i+1],depth+1,entities) == 0)) return(MagickFalse); } } @@ -1757,7 +1757,7 @@ static MagickBooleanType ParseInternalDoctype(XMLTreeRoot *root,char *xml, } entities[i+1]=ParseEntities(v,predefined_entitites,'%'); entities[i+2]=(char *) NULL; - if (ValidateEntities(n,entities[i+1],entities,0) != MagickFalse) + if (ValidateEntities(n,entities[i+1],0,entities) != MagickFalse) entities[i]=n; else {