From: cristy Date: Sat, 28 Dec 2013 23:29:28 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~3022 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5364f9cfe8b3e8765f5a05663ae075abe6236c93;p=imagemagick --- diff --git a/MagickCore/string.c b/MagickCore/string.c index 31023be89..718eccdcb 100644 --- a/MagickCore/string.c +++ b/MagickCore/string.c @@ -103,7 +103,7 @@ static const unsigned char % given string. % % An extended string is the string length, plus an extra MaxTextExtent space -% to allow for the string to be activally worked on. +% to allow for the string to be actively worked on. % % The returned string shoud be freed using DestoryString(). % diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c index 418140611..4641f012a 100644 --- a/MagickCore/xml-tree.c +++ b/MagickCore/xml-tree.c @@ -479,9 +479,8 @@ static void DestroyXMLTreeRoot(XMLTreeInfo *xml_info) /* Free root tag allocations. */ - return; root=(XMLTreeRoot *) xml_info; - for (i=NumberPredefinedEntities; root->entities[i]; i+=2) + for (i=NumberPredefinedEntities; root->entities[i] != (char *) NULL; i+=2) root->entities[i+1]=DestroyString(root->entities[i+1]); root->entities=(char **) RelinquishMagickMemory(root->entities); for (i=0; root->attributes[i] != (char **) NULL; i++) @@ -1021,7 +1020,6 @@ MagickPrivate XMLTreeInfo *InsertTagIntoXMLTree(XMLTreeInfo *xml_info, *node, *previous; - DestroyXMLTreeRoot(xml_info); child->ordered=(XMLTreeInfo *) NULL; child->sibling=(XMLTreeInfo *) NULL; child->next=(XMLTreeInfo *) NULL;