From 1e60ac33949ae533857fc6a48ce5fbc2402dd060 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 23 Aug 2017 14:59:14 +1000 Subject: RNA: report error on struct naming collision Fixes T52463, error instead of crash. --- source/blender/makesrna/intern/rna_nodetree.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'source/blender/makesrna/intern/rna_nodetree.c') diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 00b881dabc7..f15605d0f83 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -630,9 +630,13 @@ static StructRNA *rna_NodeTree_register( /* check if we have registered this tree type before, and remove it */ nt = ntreeTypeFind(dummynt.idname); - if (nt) + if (nt) { rna_NodeTree_unregister(bmain, nt->ext.srna); - + } + if (!RNA_struct_available_or_report(reports, identifier)) { + return NULL; + } + /* create a new node tree type */ nt = MEM_callocN(sizeof(bNodeTreeType), "node tree type"); memcpy(nt, &dummynt, sizeof(dummynt)); @@ -1389,11 +1393,18 @@ static bNodeType *rna_Node_register_base(Main *bmain, ReportList *reports, Struc identifier, (int)sizeof(dummynt.idname)); return NULL; } + if (!RNA_struct_available_or_report(reports, identifier)) { + return NULL; + } /* check if we have registered this node type before, and remove it */ nt = nodeTypeFind(dummynt.idname); - if (nt) + if (nt) { rna_Node_unregister(bmain, nt->ext.srna); + } + if (!RNA_struct_available_or_report(reports, identifier)) { + return NULL; + } /* create a new node type */ nt = MEM_callocN(sizeof(bNodeType), "node type"); -- cgit v1.2.3