[PATCH] msxml3: Improve error handling (Coverity)

Nikolay Sivov nsivov at codeweavers.com
Sun Apr 9 23:37:25 CDT 2017


Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 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 4c4f60ee0f..9863ed7aa4 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;
-- 
2.11.0




More information about the wine-patches mailing list