Skip to content

W
wine-winehq
Commit 3948541a authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard
Browse files
Options

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

parent 8524cc17
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 9 deletions
dlls/msxml3/node.c
View file @ 3948541a
...@@ -1310,12 +1310,8 @@ static HRESULT WINAPI xmlnode_transformNode( ...@@ -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( ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment