From 4ca84a8ae95d2703d2459d6335c4420ae32b37b6 Mon Sep 17 00:00:00 2001 From: Luca Carlon Date: Sun, 18 Oct 2020 12:59:08 +0200 Subject: Fix nullptr dereference in directshow plugin Init pointer before trying to dereference it in directshow plugin. This fixes a crash trying to play a video when QT_DIRECTSHOW_NO_EVR is set. Change-Id: Ie42eff035bd7fe173ca629c68b1228dc760c717d Reviewed-by: Volker Hilsheimer (cherry picked from commit c6e934601a3405f80c601aac207b09588e291b89) Reviewed-by: Friedemann Kleint --- src/plugins/directshow/common/directshowmediatypeenum.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins') diff --git a/src/plugins/directshow/common/directshowmediatypeenum.cpp b/src/plugins/directshow/common/directshowmediatypeenum.cpp index 0ff147fea..02281bb98 100644 --- a/src/plugins/directshow/common/directshowmediatypeenum.cpp +++ b/src/plugins/directshow/common/directshowmediatypeenum.cpp @@ -42,7 +42,8 @@ #include "directshowpin.h" DirectShowMediaTypeEnum::DirectShowMediaTypeEnum(DirectShowPin *pin) - : m_mediaTypes(pin->supportedMediaTypes()) + : m_pin(pin) + , m_mediaTypes(pin->supportedMediaTypes()) { m_pin->AddRef(); } -- cgit v1.2.3