[PATCH 2/4] quartz: fix crash in FilterGraph2_Connect

Miklós Máté mtmkls at gmail.com
Thu May 25 09:54:48 CDT 2017


And a trace improvement.

Signed-off-by: Miklós Máté <mtmkls at gmail.com>
---
 dlls/quartz/filtergraph.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index 97c049d611..a143b05d83 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -995,8 +995,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut,
         hr = VFW_E_INVALIDMEDIATYPE;
         goto out;
     }
-    TRACE("MajorType %s\n", debugstr_guid(&mt->majortype));
-    TRACE("SubType %s\n", debugstr_guid(&mt->subtype));
+    dump_AM_MEDIA_TYPE(mt);
 
     hr = IUnknown_QueryInterface(This->punkFilterMapper2, &IID_IFilterMapper2, (void**)&pFilterMapper2);
     if (FAILED(hr)) {
@@ -1040,12 +1039,14 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut,
         if (FAILED(hr))
         {
             IBaseFilter_Release(pfilter);
+            pfilter = NULL;
             goto error;
 	}
 
         if (IsEqualGUID(&clsid, &FilterCLSID)) {
             /* Skip filter (same as the one the output pin belongs to) */
             IBaseFilter_Release(pfilter);
+            pfilter = NULL;
             goto error;
         }
 
-- 
2.11.0




More information about the wine-patches mailing list