oleaut32: Don't call SafeArrayAllocData in LPSAFEARRAY_UserUnmarshal if we…

oleaut32: Don't call SafeArrayAllocData in LPSAFEARRAY_UserUnmarshal if we called SafeArrayCreateEx instead of SafeArrayAllocDescriptor. Otherwise, we'll leak memory.

oleaut32: Don't call SafeArrayAllocData in LPSAFEARRAY_UserUnmarshal if we…
baccba31 · Rob Shearman · Alexandre Julliard · 2ebee181 · baccba31
Commit baccba31 authored Dec 07, 2007 by Rob Shearman Committed by Alexandre Julliard Dec 07, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

usrmarshal.c dlls/oleaut32/usrmarshal.c +8 -3

No files found.
--- a/dlls/oleaut32/usrmarshal.c
+++ b/dlls/oleaut32/usrmarshal.c
@@ -1048,9 +1048,14 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B
    (*ppsa)->cbElements = wiresa->cbElements;
    (*ppsa)->cLocks = LOWORD(wiresa->cLocks);

-    hr = SafeArrayAllocData(*ppsa);
-    if (FAILED(hr))
-        RpcRaiseException(hr);
+    /* SafeArrayCreateEx allocates the data for us, but
+     * SafeArrayAllocDescriptor doesn't */
+    if(!vt)
+    {
+        hr = SafeArrayAllocData(*ppsa);
+        if (FAILED(hr))
+            RpcRaiseException(hr);
+    }

    if ((*(ULONG *)Buffer != cell_count) || (SAFEARRAY_GetCellCount(*ppsa) != cell_count))
        RpcRaiseException(RPC_S_INVALID_BOUND);