SafeArrayDestroy() returns success when called with a NULL

pointer. Added to the test cases.

SafeArrayDestroy() returns success when called with a NULL
26771be4 · Rein Klazes · Alexandre Julliard · e495e7e3 · 26771be4 · 26771be4
Commit 26771be4 authored Jan 31, 2005 by Rein Klazes Committed by Alexandre Julliard Jan 31, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

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

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

No files found.
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -1337,7 +1337,7 @@ HRESULT WINAPI SafeArrayDestroy(SAFEARRAY *psa)
  TRACE("(%p)\n", psa);

  if(!psa)
-    return E_INVALIDARG;
+    return S_OK;

  if(psa->cLocks > 0)
    return DISP_E_ARRAYISLOCKED;

--- a/dlls/oleaut32/tests/safearray.c
+++ b/dlls/oleaut32/tests/safearray.c
@@ -258,6 +258,9 @@ static void test_safearray(void)
 	LONG		l;
 	unsigned char	*ptr1, *ptr2;

+	hres = SafeArrayDestroy( NULL);
+	ok( hres == S_OK, "SafeArrayDestroy( NULL) returned 0x%lx\n", hres);
+
 	bound.cElements	= 1;
 	bound.lLbound	= 0;
 	a = SafeArrayCreate(-1, 1, &bound);