Skip to content

W
wine-cw
Commit 1e662d92 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

qedit: Remove redundant NULL checks before CoTaskMemFree().

Signed-off-by: 's avatarMichael Stefaniuc <mstefani@redhat.de> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 5287add1
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 12 deletions
dlls/qedit/samplegrabber.c
View file @ 1e662d92
......@@ -89,8 +89,7 @@ static ULONG WINAPI Single_IEnumMediaTypes_Release(IEnumMediaTypes *iface)
TRACE("(%p) new ref = %u\n", This, refCount);
if (refCount == 0)
{
if (This->mtype.pbFormat)
CoTaskMemFree(This->mtype.pbFormat);
CoTaskMemFree(This->mtype.pbFormat);
CoTaskMemFree(This);
}
return refCount;
......@@ -276,10 +275,8 @@ static void SampleGrabber_cleanup(SG_Impl *This)
IMemInputPin_Release(This->memOutput);
if (This->grabberIface)
ISampleGrabberCB_Release(This->grabberIface);
if (This->mtype.pbFormat)
CoTaskMemFree(This->mtype.pbFormat);
if (This->bufferData)
CoTaskMemFree(This->bufferData);
CoTaskMemFree(This->mtype.pbFormat);
CoTaskMemFree(This->bufferData);
if(This->seekthru_unk)
IUnknown_Release(This->seekthru_unk);
}
......@@ -384,8 +381,7 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample)
size = 0;
EnterCriticalSection(&This->filter.csFilter);
if (This->bufferLen != size) {
if (This->bufferData)
CoTaskMemFree(This->bufferData);
CoTaskMemFree(This->bufferData);
This->bufferData = size ? CoTaskMemAlloc(size) : NULL;
This->bufferLen = size;
}
......@@ -586,8 +582,7 @@ SampleGrabber_ISampleGrabber_SetMediaType(ISampleGrabber *iface, const AM_MEDIA_
debugstr_guid(&type->majortype), debugstr_guid(&type->subtype),
type->lSampleSize,
debugstr_guid(&type->formattype), type->cbFormat);
if (This->mtype.pbFormat)
CoTaskMemFree(This->mtype.pbFormat);
CoTaskMemFree(This->mtype.pbFormat);
This->mtype = *type;
This->mtype.pUnk = NULL;
if (type->cbFormat) {
......@@ -936,8 +931,7 @@ SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_M
!IsEqualGUID(&This->sg->mtype.formattype,&FORMAT_None) &&
!IsEqualGUID(&This->sg->mtype.formattype,&type->formattype))
return VFW_E_TYPE_NOT_ACCEPTED;
if (This->sg->mtype.pbFormat)
CoTaskMemFree(This->sg->mtype.pbFormat);
CoTaskMemFree(This->sg->mtype.pbFormat);
This->sg->mtype = *type;
This->sg->mtype.pUnk = NULL;
if (type->cbFormat) {
......
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