Calling SafeArrayDestroy on a destroyed array should be a no-op.

059cffd7 · Alberto Massari · Alexandre Julliard · dcc5b4fe · 059cffd7
Commit 059cffd7 authored Dec 12, 2002 by Alberto Massari Committed by Alexandre Julliard Dec 12, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

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

No files found.
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -578,6 +578,9 @@ HRESULT WINAPI SafeArrayDestroyData(
  if(psa->cLocks > 0)
    return DISP_E_ARRAYISLOCKED;

+  if(psa->pvData==NULL)
+    return S_OK;
+
  ulWholeArraySize = getArraySize(psa);

  if(isPointer(psa->fFeatures)) {           /* release the pointers */