Alexander Dorofeyev : quartz: Fix memory leak and behavior on errors in FilterMapper_EnumMatchingFilters .
Alexandre Julliard
julliard at winehq.org
Wed Jul 2 06:03:41 CDT 2008
Module: wine
Branch: master
Commit: b312d42059cb5d139146b9902347c02dd1d8c1ab
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b312d42059cb5d139146b9902347c02dd1d8c1ab
Author: Alexander Dorofeyev <alexd4 at inbox.lv>
Date: Wed Jul 2 00:59:33 2008 +0300
quartz: Fix memory leak and behavior on errors in FilterMapper_EnumMatchingFilters.
---
dlls/quartz/filtermapper.c | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c
index 4977924..aa92cc8 100644
--- a/dlls/quartz/filtermapper.c
+++ b/dlls/quartz/filtermapper.c
@@ -1210,6 +1210,8 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters(
OutputType[0] = clsOutMaj;
OutputType[1] = clsOutSub;
+ *ppEnum = NULL;
+
hr = IFilterMapper2_EnumMatchingFilters((IFilterMapper2*)This,
&ppEnumMoniker,
0,
@@ -1236,7 +1238,6 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters(
nb_mon++;
}
- *ppEnum = NULL;
if (!nb_mon)
{
IEnumMoniker_Release(ppEnumMoniker);
@@ -1249,6 +1250,7 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters(
IEnumMoniker_Release(ppEnumMoniker);
return E_OUTOFMEMORY;
}
+ ZeroMemory(regfilters, nb_mon * sizeof(REGFILTER)); /* will prevent bad free of Name in case of error. */
IEnumMoniker_Reset(ppEnumMoniker);
while(IEnumMoniker_Next(ppEnumMoniker, 1, &IMon, &nb) == S_OK)
@@ -1281,7 +1283,7 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters(
hr = E_OUTOFMEMORY;
}
- if (SUCCEEDED(hrSub))
+ if (SUCCEEDED(hrSub) && regfilters[idx].Name)
{
memcpy(regfilters[idx].Name, V_UNION(&var, bstrVal), len);
regfilters[idx].Clsid = clsid;
@@ -1294,17 +1296,13 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters(
VariantClear(&var);
}
- /* In case of release all resources */
- if (!SUCCEEDED(hr))
+ if (SUCCEEDED(hr))
{
- for (idx = 0; idx < nb_mon; idx++)
- CoTaskMemFree(regfilters[idx].Name);
- CoTaskMemFree(regfilters);
- IEnumMoniker_Release(ppEnumMoniker);
- return hr;
+ hr = IEnumRegFiltersImpl_Construct(regfilters, nb_mon, ppEnum);
}
- hr = IEnumRegFiltersImpl_Construct(regfilters, nb_mon, ppEnum);
+ for (idx = 0; idx < nb_mon; idx++)
+ CoTaskMemFree(regfilters[idx].Name);
CoTaskMemFree(regfilters);
IEnumMoniker_Release(ppEnumMoniker);
More information about the wine-cvs
mailing list