strmbase: Avoid leaking the media type on failure in IEnumMediaTypes::Next().

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

strmbase: Avoid leaking the media type on failure in IEnumMediaTypes::Next().
07729ea4 · Zebediah Figura · Alexandre Julliard · 2cf4b601 · 07729ea4
Commit 07729ea4 authored Jun 06, 2020 by Zebediah Figura Committed by Alexandre Julliard Jun 08, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

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

No files found.
--- a/dlls/strmbase/pin.c
+++ b/dlls/strmbase/pin.c
@@ -119,6 +119,7 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count,
        AM_MEDIA_TYPE **mts, ULONG *ret_count)
 {
    struct enum_media_types *enummt = impl_from_IEnumMediaTypes(iface);
+    AM_MEDIA_TYPE mt;
    unsigned int i;
    HRESULT hr;
@@ -133,10 +134,14 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count,
    for (i = 0; i < count; ++i)
    {
-        if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE))))
+        hr = enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->index + i, &mt);
-            hr = enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->index + i, mts[i]);
+        if (hr == S_OK)
-        else
+        {
-            hr = E_OUTOFMEMORY;
+            if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE))))
+                *mts[i] = mt;
+            else
+                hr = E_OUTOFMEMORY;
+        }
        if (FAILED(hr))
        {
            while (i--)