diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-06-04 14:39:04 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-04 14:39:04 +0400 |
commit | c6f3fabd16ff5fb9a941fbb41d7d8f07c5be14ab (patch) | |
tree | ba1d9de4ed87d512255940638ecac66633b52d59 /source/blender/blenkernel/intern/seqeffects.c | |
parent | 86f2f425bffb373f7d938138ee5ad59356df2d51 (diff) |
fix [#27568] Segmentation fault in Sequencer when adding an effect strip with python
disallow negative length effect strips.
Diffstat (limited to 'source/blender/blenkernel/intern/seqeffects.c')
-rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index d2f05a8ca53..c19a74deff6 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -3021,10 +3021,15 @@ void sequence_effect_speed_rebuild_map(Scene *scene, Sequence * seq, int force) /* if not already done, load / initialize data */ get_sequence_effect(seq); - if (!(force || seq->len != v->length || !v->frameMap)) { + if ( (force == FALSE) && + (seq->len == v->length) && + (v->frameMap != NULL) + ) { return; } - if (!seq->seq1) { /* make coverity happy and check for (CID 598) + if ( (seq->seq1 == NULL) || + (seq->len < 1) + ) { /* make coverity happy and check for (CID 598) input strip ... */ return; } |