summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorLuca Carlon <carlon.luca@gmail.com>2020-10-18 12:59:08 +0200
committerLuca Carlon <carlon.luca@gmail.com>2020-10-21 07:32:12 +0200
commit4ca84a8ae95d2703d2459d6335c4420ae32b37b6 (patch)
tree7cd147f0a5e345c97f68fe91bd5aa47fb78fb53d /src/plugins
parent4b26133b1cac084a61dbbf68b3fff711ca49f712 (diff)
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 <volker.hilsheimer@qt.io> (cherry picked from commit c6e934601a3405f80c601aac207b09588e291b89) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/directshow/common/directshowmediatypeenum.cpp3
1 files changed, 2 insertions, 1 deletions
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();
}