From c28432680971f54ebe95cc953606a3a4d3bc5c7c Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Fri, 28 Aug 2020 14:27:18 +0200 Subject: GPU: Fix Segmentation Fault Freeing Failed Shader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The CPP Shader class does not initialize the interface attribute. What will crash when deleting the shader. Reviewed By: Clément Foucault Differential Revision: https://developer.blender.org/D8740 --- release/datafiles/locale | 2 +- release/scripts/addons | 2 +- source/blender/gpu/intern/gpu_shader_private.hh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/datafiles/locale b/release/datafiles/locale index 260b439d0fb..2a85baf7318 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit 260b439d0fb15e3cd1efe5c120cf24f91d13d855 +Subproject commit 2a85baf7318e2d8a26a25e6eb8211a2395d44a76 diff --git a/release/scripts/addons b/release/scripts/addons index 01cf2f810ad..7bd666f5f3a 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 01cf2f810ad084cb4e2dad6dc7f82f3bc05f2a06 +Subproject commit 7bd666f5f3a0cb588fa99bf0786dc5ff834b2ea4 diff --git a/source/blender/gpu/intern/gpu_shader_private.hh b/source/blender/gpu/intern/gpu_shader_private.hh index 22de1a0f59e..d56a7b2500b 100644 --- a/source/blender/gpu/intern/gpu_shader_private.hh +++ b/source/blender/gpu/intern/gpu_shader_private.hh @@ -36,7 +36,7 @@ namespace gpu { class Shader { public: /** Uniform & attribute locations for shader. */ - ShaderInterface *interface; + ShaderInterface *interface = nullptr; protected: /** For debugging purpose. */ -- cgit v1.2.3