From 87c7f1e3893ce6af313c2d6728ceead03cf27e77 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 2 Nov 2023 11:17:20 +0100 Subject: [PATCH] Fix #114152: Blender crashes when loading files with unknown IDProperty types. Issue was reported with a 3.6 file crashing 3.3LTS, but the underlying problem still exists in current codebase, and could also potentially be caused by other edge-cases. --- source/blender/blenkernel/intern/idprop.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/blender/blenkernel/intern/idprop.cc b/source/blender/blenkernel/intern/idprop.cc index 0f36d6383ce..bdcf21a82ed 100644 --- a/source/blender/blenkernel/intern/idprop.cc +++ b/source/blender/blenkernel/intern/idprop.cc @@ -1307,6 +1307,10 @@ static void IDP_DirectLinkProperty(IDProperty *prop, BlendDataReader *reader); static void read_ui_data(IDProperty *prop, BlendDataReader *reader) { BLO_read_data_address(reader, &prop->ui_data); + if (!prop->ui_data) { + /* Can happen when opening more recent files with unknown tyes of IDProperties. */ + return; + } BLO_read_data_address(reader, &prop->ui_data->description); switch (IDP_ui_data_type(prop)) { -- 2.30.2