blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix T44201: Crash Deleting Hierarchy in Outliner 

Typical error using '->next' member of a freed linked list item. A bit trickier
even here, since we have some recursion...

Trivial fix for nasty crasher, safe for 2.74 imho?
This commit is contained in:
Bastien Montagne 2015-03-31 08:36:48 +02:00
parent c16a8983ef
commit 4153ff3610
Notes: blender-bot 2023-11-20 12:14:32 +01:00 
Referenced by issue #44201, Deleting Hierarchy
Referenced by issue #44201, Deleting Hierarchy
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/space_outliner/outliner_tools.c
View File

@ -694,23 +694,26 @@ static void outliner_do_data_operation(SpaceOops *soops, int type, int event, Li
}
}
static void outline_delete_hierarchy(bContext *C, Scene *scene, Base *base)
static Base *outline_delete_hierarchy(bContext *C, Scene *scene, Base *base)
{
Base *child_base;
Base *child_base, *base_next;
Object *parent;
if (!base) {
return;
return NULL;
}
for (child_base = scene->base.first; child_base; child_base = child_base->next) {
for (child_base = scene->base.first; child_base; child_base = base_next) {
base_next = child_base->next;
for (parent = child_base->object->parent; parent && (parent != base->object); parent = parent->parent);
if (parent) {
outline_delete_hierarchy(C, scene, child_base);
base_next = outline_delete_hierarchy(C, scene, child_base);
}
}
base_next = base->next;
ED_base_object_free_and_unlink(CTX_data_main(C), scene, base);
return base_next;
}
static void object_delete_hierarchy_cb(