diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-28 12:56:40 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-28 12:56:40 +0400 |
| commit | 3a4b6da67405ccba605f62ef8f67fe04e2024c28 (patch) | |
| tree | 80b8678e402b49475c2ad6b95435847f2c0f7ddb /source/blender/makesrna | |
| parent | 2d151cda1cb0b2c8be01c26e392f077f6807579a (diff) | |
Fix #28601: SEGFAULT: Regression in free_imbuf_seq
Actually, it's NULL-pointer dereference in rna_Sequence_update caused by RNA cache.
Discussed with Joshua and he thought it's acceptable for now to add
extra NULL-check here.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_sequencer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index d7e0113f56e..e585c530402 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -559,7 +559,8 @@ static void rna_Sequence_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *p { Editing *ed= seq_give_editing(scene, FALSE); - free_imbuf_seq(scene, &ed->seqbase, FALSE, TRUE); + if(ed) + free_imbuf_seq(scene, &ed->seqbase, FALSE, TRUE); } static void rna_Sequence_update_reopen_files(Main *UNUSED(bmain), Scene *scene, PointerRNA *ptr) |