From 3948541a6ca46db1cf269e8bd4ee7fc459ff719a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 31 Oct 2008 00:19:49 +0100 Subject: [PATCH] msxml3: Fixed if nesting / ptr checking problems in xmlnode_transformNode. --- dlls/msxml3/node.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1d99be35259..f2c6154cbaf 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1310,12 +1310,8 @@ static HRESULT WINAPI xmlnode_transformNode( if(pOutput) { 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); } } @@ -1332,13 +1328,12 @@ static HRESULT WINAPI xmlnode_transformNode( { pContent = xmlBufferContent(pXmlBuf); *xmlString = bstr_from_xmlChar(pContent); - - xmlBufferFree(pXmlBuf); } + xmlBufferFree(pXmlBuf); } } + xmlFreeDoc(result); } - xmlFreeDoc(result); /* libxslt "helpfully" frees the XML document the stylesheet was generated from, too */ xsltSS->doc = NULL;