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

Alexandre Julliard julliard at winehq.org
Mon Jun 8 15:19:56 CDT 2020


Module: wine
Branch: master
Commit: 07729ea4ef7d53dc39f32d47f7bf9f1b7e3a5f1b
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=07729ea4ef7d53dc39f32d47f7bf9f1b7e3a5f1b

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Sat Jun  6 16:22:44 2020 -0500

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

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

---

 dlls/strmbase/pin.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c
index eab7c0cb2e..f08c6d0186 100644
--- 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, mts[i]);
-        else
-            hr = E_OUTOFMEMORY;
+        hr = enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->index + i, &mt);
+        if (hr == S_OK)
+        {
+            if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE))))
+                *mts[i] = mt;
+            else
+                hr = E_OUTOFMEMORY;
+        }
         if (FAILED(hr))
         {
             while (i--)




More information about the wine-cvs mailing list