oleaut32: Handle non-byref safe arrays in VARIANT_UserFree.

6539b380 · Rob Shearman · Alexandre Julliard · 27790993 · 6539b380
Commit 6539b380 authored Nov 11, 2007 by Rob Shearman Committed by Alexandre Julliard Nov 12, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

usrmarshal.c dlls/oleaut32/usrmarshal.c +6 -1

No files found.
--- a/dlls/oleaut32/usrmarshal.c
+++ b/dlls/oleaut32/usrmarshal.c
@@ -661,7 +661,12 @@ void WINAPI VARIANT_UserFree(ULONG *pFlags, VARIANT *pvar)
  if (!ref) return;

  if(vt & VT_ARRAY)
-    LPSAFEARRAY_UserFree(pFlags, V_ARRAYREF(pvar));
+  {
+    if (vt & VT_BYREF)
+      LPSAFEARRAY_UserFree(pFlags, V_ARRAYREF(pvar));
+    else
+      LPSAFEARRAY_UserFree(pFlags, &V_ARRAY(pvar));
+  }
  else
  {
    switch (vt)