griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for potential null-pointer-dereference if the new action is NULL

Browse Source
This commit is contained in:
Joshua Leung
2015-04-20 12:30:29 +12:00
parent e4fbc8fc8d
commit 689241b6e5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesrna/intern/rna_space.c
View File

@@ -1237,7 +1237,7 @@ static void rna_SpaceDopeSheetEditor_action_update(Main *UNUSED(bmain), Scene *s
/* Assign new action, and adjust the usercounts accordingly */
adt->action = saction->action;
id_us_plus(&adt->action->id);
id_us_plus((ID *)adt->action);
}
else {
/* fix id-count of action we're replacing */
@@ -1247,7 +1247,7 @@ static void rna_SpaceDopeSheetEditor_action_update(Main *UNUSED(bmain), Scene *s
/* Assign new action, and adjust the usercounts accordingly */
adt->action = saction->action;
id_us_plus(&adt->action->id);
id_us_plus((ID *)adt->action);
}
}