diff options
| author | Vladimir Belyavsky <belyavskyv@gmail.com> | 2023-09-07 13:51:46 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-09-09 00:22:51 +0000 |
| commit | 91608b98213ceb2150a3d1a001e85d4554a41d86 (patch) | |
| tree | eb61f46e1b57ff100944c9294ad42ec80f17f2ff | |
| parent | ff4ddd4d5edd0fcc99c6d4cc864b8e0090c680da (diff) | |
QSGVideoMaterial: fix potential crash on nullptr access
It seems QVideoTextureHelper::createTextures() may return nullptr
under some circumstances (still not clear why and seems like one
more issue), so we need to check it explicitly to prevent crash when
accessing nullptr.
Fixes: QTBUG-116533
Change-Id: I9ea725885e17a9a954fa189ea5dd2a54463140ae
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit f2c3e825c824661ee32d60bc7a078956c0375026)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/multimediaquick/qsgvideonode_p.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/multimediaquick/qsgvideonode_p.cpp b/src/multimediaquick/qsgvideonode_p.cpp index b42b0be41..9136e7309 100644 --- a/src/multimediaquick/qsgvideonode_p.cpp +++ b/src/multimediaquick/qsgvideonode_p.cpp @@ -126,6 +126,9 @@ void QSGVideoMaterial::updateTextures(QRhi *rhi, QRhiResourceUpdateBatch *resour // update and upload all textures m_videoFrameTextures = QVideoTextureHelper::createTextures(m_currentFrame, rhi, resourceUpdates, std::move(m_videoFrameTextures)); + if (!m_videoFrameTextures) + return; + for (int plane = 0; plane < 3; ++plane) m_textures[plane].setRhiTexture(m_videoFrameTextures->texture(plane)); m_texturesDirty = false; |