summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Blechmann <tim@klingt.org>2024-03-21 11:40:32 +0800
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-03-25 14:35:12 +0000
commitbf8ffdd473ba3f25334c827d571a7cdb520258d1 (patch)
tree93ca249ed2aed0460706a69dc16e2dfca9feecef
parent4c79ae481ba74eb993049b908c12b7edfffa73c1 (diff)
GStreamer: cast - fix nullptr support
Don't preform runtime type check on nullptr. Pick-to: 6.5 Change-Id: I2359b2c77bc534dcacf3119785146f215bc8ec3d Reviewed-by: Mikko Hallamaa <mikko.hallamaa@qt.io> Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> (cherry picked from commit 483e128a0ef661f97dcfa5797b36c3aea8d2cd01) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit b9a03fd0b4da51ac9e4310c452c1cb7658359d55)
-rw-r--r--src/plugins/multimedia/gstreamer/common/qgst_p.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/multimedia/gstreamer/common/qgst_p.h b/src/plugins/multimedia/gstreamer/common/qgst_p.h
index 080e8e04c..a0838f960 100644
--- a/src/plugins/multimedia/gstreamer/common/qgst_p.h
+++ b/src/plugins/multimedia/gstreamer/common/qgst_p.h
@@ -88,7 +88,7 @@ template <typename DestinationType, typename SourceType>
DestinationType *qGstSafeCast(SourceType *arg)
{
using Traits = QGstImpl::GstObjectTraits<DestinationType>;
- if (Traits::isObjectOfType(arg))
+ if (arg && Traits::isObjectOfType(arg))
return Traits::cast(arg);
return nullptr;
}
@@ -97,7 +97,8 @@ template <typename DestinationType, typename SourceType>
DestinationType *qGstCheckedCast(SourceType *arg)
{
using Traits = QGstImpl::GstObjectTraits<DestinationType>;
- Q_ASSERT(Traits::isObjectOfType(arg));
+ if (arg)
+ Q_ASSERT(Traits::isObjectOfType(arg));
return Traits::cast(arg);
}