Nikolay Sivov : msxml3: Improve error handling (Coverity).
Alexandre Julliard
julliard at winehq.org
Mon Apr 10 15:37:17 CDT 2017
Module: wine
Branch: master
Commit: d7d5d93e8601bdedcffde0ad04af178d8890bfd3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d5d93e8601bdedcffde0ad04af178d8890bfd3
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon Apr 10 07:37:25 2017 +0300
msxml3: Improve error handling (Coverity).
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msxml3/stylesheet.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c
index 4c4f60e..9863ed7 100644
--- a/dlls/msxml3/stylesheet.c
+++ b/dlls/msxml3/stylesheet.c
@@ -570,9 +570,8 @@ static HRESULT WINAPI xslprocessor_transform(
TRACE("(%p)->(%p)\n", This, ret);
- if (!ret) return E_INVALIDARG;
-
- SysFreeString(This->outstr);
+ if (!ret)
+ return E_INVALIDARG;
if (This->output_type == PROCESSOR_OUTPUT_STREAM)
{
@@ -582,9 +581,12 @@ static HRESULT WINAPI xslprocessor_transform(
else if (This->output_type == PROCESSOR_OUTPUT_PERSISTSTREAM ||
This->output_type == PROCESSOR_OUTPUT_RESPONSE)
{
- CreateStreamOnHGlobal(NULL, TRUE, (IStream **)&stream);
+ if (FAILED(hr = CreateStreamOnHGlobal(NULL, TRUE, (IStream **)&stream)))
+ return hr;
}
+ SysFreeString(This->outstr);
+
hr = node_transform_node_params(get_node_obj(This->input), This->stylesheet->node,
&This->outstr, stream, &This->params);
if (SUCCEEDED(hr))
@@ -612,7 +614,8 @@ static HRESULT WINAPI xslprocessor_transform(
DWORD size;
void *dest;
- GetHGlobalFromStream(src, &hglobal);
+ if (FAILED(hr = GetHGlobalFromStream(src, &hglobal)))
+ break;
size = GlobalSize(hglobal);
bound.lLbound = 0;
More information about the wine-cvs
mailing list