oleaut32: Fix error handling/reporting in TLB_copy_all_custdata.

VariantCopy clears existing contents of pvargDest and thus requires it contain a valid (possibly-empty) VARIANT, not uninitialized garbage. If a failure still occurs, propgate the HRESULT to GetAll*CustData. Signed-off-by: Kevin Puetz <PuetzKevinA@JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

oleaut32: Fix error handling/reporting in TLB_copy_all_custdata.
cd38abc4 · Kevin Puetz · Alexandre Julliard · 8341b255 · cd38abc4
Commit cd38abc4 authored Nov 17, 2020 by Kevin Puetz Committed by Alexandre Julliard Nov 18, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

typelib.c dlls/oleaut32/typelib.c +5 -2

No files found.
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -5288,6 +5288,7 @@ static HRESULT TLB_copy_all_custdata(const struct list *custdata_list, CUSTDATA 
    TLBCustData *pCData;
    unsigned int ct;
    CUSTDATAITEM *cdi;
+    HRESULT hr = S_OK;

    ct = list_count(custdata_list);

@@ -5300,11 +5301,13 @@ static HRESULT TLB_copy_all_custdata(const struct list *custdata_list, CUSTDATA 
    cdi = pCustData->prgCustData;
    LIST_FOR_EACH_ENTRY(pCData, custdata_list, TLBCustData, entry){
        cdi->guid = *TLB_get_guid_null(pCData->guid);
-        VariantCopy(&cdi->varValue, &pCData->data);
+        VariantInit(&cdi->varValue);
+        hr = VariantCopy(&cdi->varValue, &pCData->data);
+        if(FAILED(hr)) break;
        ++cdi;
    }

-    return S_OK;
+    return hr;
 }