Skip to content

W
wine-cw
Commit 93f8819c authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

ole32: Allocate and free moniker lists with CRT allocations.

The RunningObjectTableImpl_EnumRunning codepath returns a list allocated from combase MIDL_user_allocate, which uses msvcrt heap.
parent a547efc0
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
dlls/ole32/moniker.c
View file @ 93f8819c
...@@ -1033,8 +1033,8 @@ static ULONG WINAPI EnumMonikerImpl_Release(IEnumMoniker* iface) ...@@ -1033,8 +1033,8 @@ static ULONG WINAPI EnumMonikerImpl_Release(IEnumMoniker* iface)
TRACE("(%p) Deleting\n",This); TRACE("(%p) Deleting\n",This);
for (i = 0; i < This->moniker_list->size; i++) for (i = 0; i < This->moniker_list->size; i++)
HeapFree(GetProcessHeap(), 0, This->moniker_list->interfaces[i]); free(This->moniker_list->interfaces[i]);
HeapFree(GetProcessHeap(), 0, This->moniker_list); free(This->moniker_list);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }
...@@ -1119,7 +1119,7 @@ static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker ...@@ -1119,7 +1119,7 @@ static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker
*ppenum = NULL; *ppenum = NULL;
moniker_list = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceList, interfaces[This->moniker_list->size])); moniker_list = malloc(FIELD_OFFSET(InterfaceList, interfaces[This->moniker_list->size]));
if (!moniker_list) if (!moniker_list)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
...@@ -1127,13 +1127,13 @@ static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker ...@@ -1127,13 +1127,13 @@ static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker
for (i = 0; i < This->moniker_list->size; i++) for (i = 0; i < This->moniker_list->size; i++)
{ {
SIZE_T size = FIELD_OFFSET(InterfaceData, abData[This->moniker_list->interfaces[i]->ulCntData]); SIZE_T size = FIELD_OFFSET(InterfaceData, abData[This->moniker_list->interfaces[i]->ulCntData]);
moniker_list->interfaces[i] = HeapAlloc(GetProcessHeap(), 0, size); moniker_list->interfaces[i] = malloc(size);
if (!moniker_list->interfaces[i]) if (!moniker_list->interfaces[i])
{ {
ULONG end = i; ULONG end = i;
for (i = 0; i < end; i++) for (i = 0; i < end; i++)
HeapFree(GetProcessHeap(), 0, moniker_list->interfaces[i]); free(moniker_list->interfaces[i]);
HeapFree(GetProcessHeap(), 0, moniker_list); free(moniker_list);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
memcpy(moniker_list->interfaces[i], This->moniker_list->interfaces[i], size); memcpy(moniker_list->interfaces[i], This->moniker_list->interfaces[i], size);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment