strmbase: Fix some memory leaks (Valgrind).

Signed-off-by: Sven Baars <sven.wine@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> (cherry picked from commit c7f51d85) Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

strmbase: Fix some memory leaks (Valgrind).
427b8c67 · Sven Baars · Michael Stefaniuc · a754861e · 427b8c67 · 427b8c67
Commit 427b8c67 authored Jan 29, 2019 by Sven Baars Committed by Michael Stefaniuc Apr 26, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

mediatype.c dlls/strmbase/mediatype.c +6 -3

renderer.c dlls/strmbase/renderer.c +1 -0

No files found.
--- a/dlls/strmbase/mediatype.c
+++ b/dlls/strmbase/mediatype.c
@@ -264,14 +264,17 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface)
    CoTaskMemFree(This->enumMediaDetails.pMediaTypes);

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

    This->enumMediaDetails.cMediaTypes = i;
    This->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * i);
    for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++)
    {
-        This->enumMediaFunction(This->basePin, i,&amt);
-        if (FAILED(CopyMediaType(&This->enumMediaDetails.pMediaTypes[i], &amt)))
+        if (FAILED(This->enumMediaFunction(This->basePin, i, &This->enumMediaDetails.pMediaTypes[i])))
        {
            while (i--)
                FreeMediaType(&This->enumMediaDetails.pMediaTypes[i]);

--- a/dlls/strmbase/renderer.c
+++ b/dlls/strmbase/renderer.c
@@ -346,6 +346,7 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp
        {
            return VFW_E_TYPE_NOT_ACCEPTED;
        }
+        DeleteMediaType(pmt);
    }

    This->pMediaSample = pSample;