SafeArrayDestroyData - keep pointer, don't destroy data if FADF_STATIC

is set.

SafeArrayDestroyData - keep pointer, don't destroy data if FADF_STATIC
bb313c9d · Walt Ogburn · Alexandre Julliard · 5d5f5230 · bb313c9d
Commit bb313c9d authored Oct 19, 2004 by Walt Ogburn Committed by Alexandre Julliard Oct 19, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

No files found.
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -1254,7 +1254,8 @@ HRESULT WINAPI SafeArrayDestroyData(SAFEARRAY *psa)
  if (psa->cLocks)
    return DISP_E_ARRAYISLOCKED; /* Can't delete a locked array */

-  if (psa->pvData)
+  /* If static, keep pvData and don't free */
+  if (psa->pvData && !(psa->fFeatures & FADF_STATIC))
  {
    /* Delete the actual item data */
    if (FAILED(SAFEARRAY_DestroyData(psa, 0)))