msxml3: Fixed if nesting / ptr checking problems in xmlnode_transformNode.

This commit is contained in:
Marcus Meissner 2008-10-31 00:19:49 +01:00 committed by Alexandre Julliard
parent 8524cc17b3
commit 3948541a6c
1 changed files with 4 additions and 9 deletions

View File

@ -1310,12 +1310,8 @@ static HRESULT WINAPI xmlnode_transformNode(
if(pOutput) if(pOutput)
{ {
htmlDocContentDumpOutput(pOutput, result->doc, NULL); htmlDocContentDumpOutput(pOutput, result->doc, NULL);
if(pOutput) pContent = xmlBufferContent(pOutput->buffer);
{ *xmlString = bstr_from_xmlChar(pContent);
pContent = xmlBufferContent(pOutput->buffer);
*xmlString = bstr_from_xmlChar(pContent);
}
xmlOutputBufferClose(pOutput); xmlOutputBufferClose(pOutput);
} }
} }
@ -1332,13 +1328,12 @@ static HRESULT WINAPI xmlnode_transformNode(
{ {
pContent = xmlBufferContent(pXmlBuf); pContent = xmlBufferContent(pXmlBuf);
*xmlString = bstr_from_xmlChar(pContent); *xmlString = bstr_from_xmlChar(pContent);
xmlBufferFree(pXmlBuf);
} }
xmlBufferFree(pXmlBuf);
} }
} }
xmlFreeDoc(result);
} }
xmlFreeDoc(result);
/* libxslt "helpfully" frees the XML document the stylesheet was /* libxslt "helpfully" frees the XML document the stylesheet was
generated from, too */ generated from, too */
xsltSS->doc = NULL; xsltSS->doc = NULL;