ole32: Allocate memory for a copy of the ptd member of FORMATETC in

DataAdviseHolder_Advise since there is no requirement for the application to keep this memory valid for the lifetime of the connection.

ole32: Allocate memory for a copy of the ptd member of FORMATETC in
bb127642 · Robert Shearman · Alexandre Julliard · 5e9df71e · bb127642
Commit bb127642 authored Aug 31, 2006 by Robert Shearman Committed by Alexandre Julliard Sep 07, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

oleobj.c dlls/ole32/oleobj.c +11 -1

No files found.
--- a/dlls/ole32/oleobj.c
+++ b/dlls/ole32/oleobj.c
@@ -723,8 +723,18 @@ static HRESULT WINAPI DataAdviseHolder_Advise(
   * Store the new sink
   */
  This->Connections[index].sink = pAdvise;
-  memcpy(&(This->Connections[index].fmat), pFetc, sizeof(FORMATETC));
  This->Connections[index].advf = advf & ~WINE_ADVF_REMOTE;
+  memcpy(&(This->Connections[index].fmat), pFetc, sizeof(FORMATETC));
+  if (pFetc->ptd)
+  {
+    This->Connections[index].fmat.ptd = CoTaskMemAlloc(pFetc->ptd->tdSize);
+    if (!This->Connections[index].fmat.ptd)
+    {
+      IDataAdviseHolder_Unadvise(iface, index + 1);
+      return E_OUTOFMEMORY;
+    }
+    memcpy(This->Connections[index].fmat.ptd, pFetc->ptd, pFetc->ptd->tdSize);
+  }

  if (This->Connections[index].sink != NULL) {
    IAdviseSink_AddRef(This->Connections[index].sink);