quartz: Check allocation failure and clear memory in DSound
Renderer [try 2]
Chris Robinson
chris.kcat at gmail.com
Fri Mar 9 07:49:41 CST 2007
-------------- next part --------------
From 2e81ccd8db79528d82d75a84b884476edc529e1e Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat at gmail.com>
Date: Fri, 9 Mar 2007 05:47:37 -0800
Subject: [PATCH] quartz: Check allocation failure and clear memory in DSound Renderer
---
dlls/quartz/dsoundrender.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index fe6152f..0eb22da 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -316,18 +316,24 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv)
return CLASS_E_NOAGGREGATION;
pDSoundRender = CoTaskMemAlloc(sizeof(DSoundRenderImpl));
+ if (!pDSoundRender)
+ return E_OUTOFMEMORY;
+ ZeroMemory(pDSoundRender, sizeof(DSoundRenderImpl));
pDSoundRender->lpVtbl = &DSoundRender_Vtbl;
pDSoundRender->IBasicAudio_vtbl = &IBasicAudio_Vtbl;
pDSoundRender->refCount = 1;
InitializeCriticalSection(&pDSoundRender->csFilter);
pDSoundRender->state = State_Stopped;
- pDSoundRender->pClock = NULL;
- pDSoundRender->init = FALSE;
- pDSoundRender->started = FALSE;
- ZeroMemory(&pDSoundRender->filterInfo, sizeof(FILTER_INFO));
pDSoundRender->ppPins = CoTaskMemAlloc(1 * sizeof(IPin *));
+ if (!pDSoundRender->ppPins)
+ {
+ DeleteCriticalSection(&pDSoundRender->csFilter);
+ CoTaskMemFree(pDSoundRender);
+ return E_OUTOFMEMORY;
+ }
+ ZeroMemory(pDSoundRender->ppPins, 1 * sizeof(IPin *));
/* construct input pin */
piInput.dir = PINDIR_INPUT;
--
1.4.4.4
More information about the wine-patches
mailing list