diff options
| author | Harald Vistnes <harald@impetus.no> | 2022-02-08 13:58:46 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-10 19:00:12 +0000 |
| commit | 8140545da89c1d10959198a9f6054ce71173b11e (patch) | |
| tree | 551bdb76c5ebba73e2759e4835fd718306cf8756 | |
| parent | c336423d2d314f84b8593ce6a3f6a0785ac9681f (diff) | |
Fix crash in Renderer::cleanupShader
Input parameter shader was not checked for null before being dereferenced. Added check for null to avoid this.
Task-number: QTBUG-100568
Change-Id: I568b97169320ea4504955467fdf12584f5320a06
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit cb0751cdd983da7b93457ff15d0e0a0c19646e0a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/renderers/opengl/renderer/renderer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/renderers/opengl/renderer/renderer.cpp b/src/plugins/renderers/opengl/renderer/renderer.cpp index e09423005..aaec6ad7b 100644 --- a/src/plugins/renderers/opengl/renderer/renderer.cpp +++ b/src/plugins/renderers/opengl/renderer/renderer.cpp @@ -1426,6 +1426,9 @@ void Renderer::cleanupTexture(Qt3DCore::QNodeId cleanedUpTextureId) // Render Thread void Renderer::cleanupShader(const Shader *shader) { + if (!shader) + return; + GLShaderManager *glShaderManager = m_glResourceManagers->glShaderManager(); GLShader *glShader = glShaderManager->lookupResource(shader->peerId()); |