Module: wine Branch: master Commit: 1452e47f0a91b85afa0057c25dd14cbc65cecdff URL: https://source.winehq.org/git/wine.git/?a=commit;h=1452e47f0a91b85afa0057c25...
Author: Zebediah Figura z.figura12@gmail.com Date: Thu Dec 3 20:55:39 2020 -0600
mfplat: Zero-initialize the device manager object.
This fixes a crash for me when reallocating "handles", triggered by the mfplat tests.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/mfplat/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e4cd1c397ad..54bd70a2fff 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -8911,14 +8911,12 @@ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **man if (!token || !manager) return E_POINTER;
- object = heap_alloc(sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY;
object->IMFDXGIDeviceManager_iface.lpVtbl = &dxgi_device_manager_vtbl; object->refcount = 1; object->token = GetTickCount(); - object->device = NULL; InitializeCriticalSection(&object->cs); InitializeConditionVariable(&object->lock);