If SafeArrayGetElement is called on a variant array, initialize

destination variant before copying the array element to it, some badly behaved apps don't seem to do it themselves.

If SafeArrayGetElement is called on a variant array, initialize
fbdfef73 · Ove Kaaven · Alexandre Julliard · a0da6694 · fbdfef73
Commit fbdfef73 authored Jan 02, 2002 by Ove Kaaven Committed by Alexandre Julliard Jan 02, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

safearray.c dlls/oleaut32/safearray.c +3 -1

No files found.
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -356,7 +356,9 @@ HRESULT WINAPI SafeArrayGetElement(
        *((BSTR*)pv) = pbstrReturnedStr; 
    }
    else if( psa->fFeatures == FADF_VARIANT) {
-      HRESULT hr = VariantCopy(pv, elementStorageAddress);
+      HRESULT hr;
+      VariantInit(pv);
+      hr = VariantCopy(pv, elementStorageAddress);
      if (FAILED(hr)) {
        SafeArrayUnlock(psa);
        return hr;