strmbase: Fix media type leaks when creating IEnumMediaTypes instance (Valgrind).

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

strmbase: Fix media type leaks when creating IEnumMediaTypes instance (Valgrind).
51021faa · Nikolay Sivov · Alexandre Julliard · 5f38bfed · 51021faa
Commit 51021faa authored Aug 15, 2016 by Nikolay Sivov Committed by Alexandre Julliard Aug 17, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

mediatype.c dlls/strmbase/mediatype.c +9 -4

No files found.
--- a/dlls/strmbase/mediatype.c
+++ b/dlls/strmbase/mediatype.c
@@ -125,18 +125,23 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e
    pEnumMediaTypes->basePin = basePin;

    i = 0;
-    while (enumFunc(basePin, i, &amt) == S_OK) i++;
+    while (enumFunc(basePin, i, &amt) == S_OK)
+    {
+        FreeMediaType(&amt);
+        i++;
+    }

    pEnumMediaTypes->enumMediaDetails.cMediaTypes = i;
    pEnumMediaTypes->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * i);
    memset(pEnumMediaTypes->enumMediaDetails.pMediaTypes, 0, sizeof(AM_MEDIA_TYPE) * i);
    for (i = 0; i < pEnumMediaTypes->enumMediaDetails.cMediaTypes; i++)
    {
-        enumFunc(basePin,i,&amt);
-        if (FAILED(CopyMediaType(&pEnumMediaTypes->enumMediaDetails.pMediaTypes[i], &amt)))
+        HRESULT hr;
+
+        if (FAILED(hr = enumFunc(basePin, i, &pEnumMediaTypes->enumMediaDetails.pMediaTypes[i])))
        {
            IEnumMediaTypes_Release(&pEnumMediaTypes->IEnumMediaTypes_iface);
-            return E_OUTOFMEMORY;
+            return hr;
        }
    }
    *ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface;