Sven Baars : quartz: Fix some memory leaks (Valgrind).
Alexandre Julliard
julliard at winehq.org
Wed Dec 26 17:47:10 CST 2018
Module: wine
Branch: master
Commit: 889fe31483e05e162345e0d329e071761290a054
URL: https://source.winehq.org/git/wine.git/?a=commit;h=889fe31483e05e162345e0d329e071761290a054
Author: Sven Baars <sven.wine at gmail.com>
Date: Sat Dec 22 15:47:22 2018 +0100
quartz: Fix some memory leaks (Valgrind).
Signed-off-by: Sven Baars <sven.wine at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/filesource.c | 6 +++---
dlls/quartz/filtergraph.c | 4 ++++
dlls/quartz/memallocator.c | 5 ++++-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index e5904dc..df444ae 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -493,7 +493,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface)
}
CoTaskMemFree(This->pszFileName);
if (This->pmt)
- FreeMediaType(This->pmt);
+ DeleteMediaType(This->pmt);
BaseFilter_Destroy(&This->filter);
CoTaskMemFree(This);
return 0;
@@ -610,7 +610,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi
{
CoTaskMemFree(This->pszFileName);
if (This->pmt)
- FreeMediaType(This->pmt);
+ DeleteMediaType(This->pmt);
This->pszFileName = CoTaskMemAlloc((strlenW(pszFileName) + 1) * sizeof(WCHAR));
strcpyW(This->pszFileName, pszFileName);
@@ -650,7 +650,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi
CoTaskMemFree(This->pszFileName);
if (This->pmt)
- FreeMediaType(This->pmt);
+ DeleteMediaType(This->pmt);
This->pszFileName = NULL;
This->pmt = NULL;
diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index 7abffa5..02707b4 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -687,6 +687,7 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte
IBaseFilter_SetSyncSource(pFilter, NULL);
IBaseFilter_Release(pFilter);
list_remove(&entry->entry);
+ CoTaskMemFree(entry->name);
heap_free(entry);
This->version++;
/* Invalidate interfaces in the cache */
@@ -1801,6 +1802,9 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR
TRACE("MajorType %s\n", debugstr_guid(&mt.majortype));
TRACE("SubType %s\n", debugstr_guid(&mt.subtype));
+ CoTaskMemFree(filename);
+ FreeMediaType(&mt);
+
if (ppFilter)
*ppFilter = preader;
IFileSourceFilter_Release(pfile);
diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c
index f5ee3c2..477c63a 100644
--- a/dlls/quartz/memallocator.c
+++ b/dlls/quartz/memallocator.c
@@ -444,6 +444,9 @@ static HRESULT StdMediaSample2_Construct(BYTE * pbBuffer, LONG cbBuffer, IMemAll
static void StdMediaSample2_Delete(StdMediaSample2 * This)
{
+ if (This->props.pMediaType)
+ DeleteMediaType(This->props.pMediaType);
+
/* NOTE: does not remove itself from the list it belongs to */
CoTaskMemFree(This);
}
@@ -676,7 +679,7 @@ static HRESULT WINAPI StdMediaSample2_SetMediaType(IMediaSample2 * iface, AM_MED
if (This->props.pMediaType)
{
- FreeMediaType(This->props.pMediaType);
+ DeleteMediaType(This->props.pMediaType);
This->props.pMediaType = NULL;
}
if (!pMediaType)
More information about the wine-cvs
mailing list