diff options
| author | Joshua Leung <aligorith@gmail.com> | 2015-04-20 03:30:29 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2015-04-20 08:27:57 +0300 |
| commit | 689241b6e5d962c14a6650082fc0ecf4a3a0aa5e (patch) | |
| tree | 94aa797445a8a86434d1fc41b82e986f63cae3b6 /source/blender/makesrna/intern | |
| parent | e4fbc8fc8ddf5c212146fa90c38437389ef25db5 (diff) | |
Fix for potential null-pointer-dereference if the new action is NULL
Diffstat (limited to 'source/blender/makesrna/intern')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 300752d8cf5..0c94575de4c 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -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); } } |