oleaut32: Clear any existing interface before calling WdtpInterfacePointer_UserUnmarshal().

The code has already called VariantClear() which has released the interface yet not set it to NULL. This is to prevent a double-release after a forthcoming patch to WdtpInterfacePointer_UserUnmarshal(). Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

oleaut32: Clear any existing interface before calling WdtpInterfacePointer_UserUnmarshal().
9ed47775 · Huw Davies · Alexandre Julliard · c820139b · 9ed47775
Commit 9ed47775 authored Oct 27, 2015 by Huw Davies Committed by Alexandre Julliard Oct 28, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

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

No files found.
--- a/dlls/oleaut32/usrmarshal.c
+++ b/dlls/oleaut32/usrmarshal.c
@@ -349,11 +349,12 @@ static unsigned char *interface_variant_unmarshal(ULONG *pFlags, unsigned char *
  ptr = *(DWORD*)Buffer;
  Buffer += sizeof(DWORD);

+  /* Clear any existing interface which WdtpInterfacePointer_UserUnmarshal()
+     would try to release.  This has been done already with a VariantClear(). */
+  *ppunk = NULL;
+
  if(!ptr)
-  {
-      *ppunk = NULL;
      return Buffer;
-  }

  return WdtpInterfacePointer_UserUnmarshal(pFlags, Buffer, ppunk, riid);
 }