dxdiagn: Improve error handling when converting to VT_BSTR (Coverity).

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dxdiagn: Improve error handling when converting to VT_BSTR (Coverity).
0aa56cab · Nikolay Sivov · Alexandre Julliard · a0b8f178 · 0aa56cab
Commit 0aa56cab authored Dec 22, 2015 by Nikolay Sivov Committed by Alexandre Julliard Dec 22, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

provider.c dlls/dxdiagn/provider.c +7 -1

No files found.
--- a/dlls/dxdiagn/provider.c
+++ b/dlls/dxdiagn/provider.c
@@ -346,6 +346,7 @@ static inline HRESULT add_bool_property(IDxDiagContainerImpl_Container *node, co
 static inline HRESULT add_ull_as_bstr_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, ULONGLONG data )
 {
    IDxDiagContainerImpl_Property *prop;
+    HRESULT hr;

    prop = allocate_property_information(propName);
    if (!prop)
@@ -354,7 +355,12 @@ static inline HRESULT add_ull_as_bstr_property(IDxDiagContainerImpl_Container *n
    V_VT(&prop->vProp) = VT_UI8;
    V_UI8(&prop->vProp) = data;

-    VariantChangeType(&prop->vProp, &prop->vProp, 0, VT_BSTR);
+    hr = VariantChangeType(&prop->vProp, &prop->vProp, 0, VT_BSTR);
+    if (FAILED(hr))
+    {
+        free_property_information(prop);
+        return hr;
+    }

    list_add_tail(&node->properties, &prop->entry);
    ++node->nProperties;