system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 19:47:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

oleaut32: Fix error handling/reporting in TLB_copy_all_custdata.

Browse source 
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>
This commit is contained in:
Kevin Puetz 2020-11-17 19:14:18 -06:00 committed by Alexandre Julliard
parent 8341b2550d
commit cd38abc455
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/oleaut32/typelib.c
View file

@ -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;
}